geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r616098 - /geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenejbRemoteLoginModule.java
Date Mon, 28 Jan 2008 22:52:08 GMT
Author: jbohn
Date: Mon Jan 28 14:52:04 2008
New Revision: 616098

URL: http://svn.apache.org/viewvc?rev=616098&view=rev
Log:
GERONIMO-3744 fix NPE when using long option names in OpenEjbRemoteLoginModule

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=616098&r1=616097&r2=616098&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
Mon Jan 28 14:52:04 2008
@@ -85,10 +85,15 @@
         if (securityRealm == null) {
             securityRealm = (String) options.get(SECURITY_REALM_KEY_LONG);
         }
-        serverURI = URI.create((String) options.get(SERVER_URI_KEY));
-        if (serverURI == null) {
+
+        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));
+        }
+
     }
 
     public boolean login() throws LoginException {



Mime
View raw message