geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r412812 - /geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/realm/providers/LDAPLoginModule.java
Date Thu, 08 Jun 2006 17:43:44 GMT
Author: ammulder
Date: Thu Jun  8 10:43:43 2006
New Revision: 412812

URL: http://svn.apache.org/viewvc?rev=412812&view=rev
Log:
LDAP login modules substitutes empty strings for nulls when
  configuring its inital context.  GERONIMO-1791 GERONIMO-1817

Modified:
    geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/realm/providers/LDAPLoginModule.java

Modified: geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/realm/providers/LDAPLoginModule.java
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/realm/providers/LDAPLoginModule.java?rev=412812&r1=412811&r2=412812&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/realm/providers/LDAPLoginModule.java
(original)
+++ geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/realm/providers/LDAPLoginModule.java
Thu Jun  8 10:43:43 2006
@@ -419,9 +419,9 @@
             if (connectionPassword != null || !"".equals(connectionPassword)) {
                 env.put(Context.SECURITY_CREDENTIALS, connectionPassword);
             }
-            env.put(Context.SECURITY_PROTOCOL, connectionProtocol);
-            env.put(Context.PROVIDER_URL, connectionURL);
-            env.put(Context.SECURITY_AUTHENTICATION, authentication);
+            env.put(Context.SECURITY_PROTOCOL, connectionProtocol == null ? "" : connectionProtocol);
+            env.put(Context.PROVIDER_URL, connectionURL == null ? "" : connectionURL);
+            env.put(Context.SECURITY_AUTHENTICATION, authentication == null ? "" : authentication);
             context = new InitialDirContext(env);
 
         } catch (NamingException e) {



Mime
View raw message