Skip to content

Commit b4eb527

Browse files
committed
Small fixes
1 parent 79a2641 commit b4eb527

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

cogkit/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/task/SecurityContextImpl.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public SecurityContextImpl(Object credentials) {
4848

4949
public SecurityContextImpl(Object credentials, String alias) {
5050
this();
51-
this.credentials = credentials;
51+
setCredentials(credentials);
5252
this.alias = alias;
5353
}
5454

@@ -130,7 +130,13 @@ protected Object getProperty(Map<String, Object> m, String key, Object default_)
130130
}
131131

132132
protected Object getProperty(Map<String, Object> m, String key) {
133+
if (m == null) {
134+
throw new IllegalArgumentException("Missing credential property '" + key + "'");
135+
}
133136
Object o = m.get(key);
137+
if (o == null) {
138+
o = m.get(key.toLowerCase());
139+
}
134140
if (o == null) {
135141
throw new IllegalArgumentException("Missing credential property '" + key + "'");
136142
}
@@ -148,6 +154,9 @@ protected String getStringProperty(Map<String, Object> m, String key, String def
148154
}
149155

150156
private String toString(Object o, String key) {
157+
if (o == null) {
158+
return null;
159+
}
151160
if (o instanceof String) {
152161
return (String) o;
153162
}

0 commit comments

Comments
 (0)