David,
It appears that this change causes an error (NPE) when the old, longer
names are used. We get a NPE because "options.get(SERVER_URI_KEY)"
returns null and therefore causes the URI.create() to fail. Would
something like this be better?
String serverURIshort = (String) options.get(SERVER_URI_KEY);
if (serverURIshort == null) {
serverURI = URI.create((String)
options.get(SERVER_URI_KEY_LONG));
}
else {
serverURI = URI.create((String) options.get(SERVER_URI_KEY));
}
Thanks,
Joe
[EMAIL PROTECTED] wrote:
Author: djencks
Date: Fri Jan 25 15:28:58 2008
New Revision: 615397
URL: http://svn.apache.org/viewvc?rev=615397&view=rev
Log:
GERONIMO-3744 Shorten option names in OpenEjbRemoteLoginModule. Preserver the
long ones too
Modified:
geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenejbRemoteLoginModule.java
Modified:
geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenejbRemoteLoginModule.java
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenejbRemoteLoginModule.java?rev=615397&r1=615396&r2=615397&view=diff
==============================================================================
---
geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenejbRemoteLoginModule.java
(original)
+++
geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenejbRemoteLoginModule.java
Fri Jan 25 15:28:58 2008
@@ -58,9 +58,12 @@
public class OpenejbRemoteLoginModule implements LoginModule {
private static Log log = LogFactory.getLog(OpenejbRemoteLoginModule.class);
- private static final String SECURITY_REALM_KEY = "org.apache.geronimo.openejb.OpenejbRemoteLoginModule.RemoteSecurityRealm";
- private static final String SERVER_URI_KEY =
"org.apache.geronimo.openejb.OpenejbRemoteLoginModule.ServerURI";
- public final static List<String> supportedOptions =
Collections.unmodifiableList(Arrays.asList(SECURITY_REALM_KEY, SERVER_URI_KEY));
+
+ private static final String SECURITY_REALM_KEY = "RemoteSecurityRealm";
+ private static final String SECURITY_REALM_KEY_LONG =
OpenejbRemoteLoginModule.class.getName() + "." + SECURITY_REALM_KEY;
+ private static final String SERVER_URI_KEY = "ServerURI";
+ private static final String SERVER_URI_KEY_LONG =
OpenejbRemoteLoginModule.class.getName() + "." + SERVER_URI_KEY;
+ public final static List<String> supportedOptions =
Collections.unmodifiableList(Arrays.asList(SECURITY_REALM_KEY, SERVER_URI_KEY,
SECURITY_REALM_KEY_LONG, SERVER_URI_KEY_LONG));
private Subject subject;
private CallbackHandler callbackHandler;
@@ -79,7 +82,13 @@
}
}
securityRealm = (String) options.get(SECURITY_REALM_KEY);
+ if (securityRealm == null) {
+ securityRealm = (String) options.get(SECURITY_REALM_KEY_LONG);
+ }
serverURI = URI.create((String) options.get(SERVER_URI_KEY));
+ if (serverURI == null) {
+ serverURI = URI.create((String) options.get(SERVER_URI_KEY_LONG));
+ }
}
public boolean login() throws LoginException {
