karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject svn commit: r1460162 - /karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java
Date Sat, 23 Mar 2013 14:29:49 GMT
Author: jbonofre
Date: Sat Mar 23 14:29:49 2013
New Revision: 1460162

URL: http://svn.apache.org/r1460162
Log:
[KARAF-2237] Avoid parsing exception in LDAPLoginModule

Modified:
    karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java

Modified: karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java?rev=1460162&r1=1460161&r2=1460162&view=diff
==============================================================================
--- karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java
(original)
+++ karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java
Sat Mar 23 14:29:49 2013
@@ -120,7 +120,9 @@ public class LDAPLoginModule extends Abs
         sslKeystore = (String) options.get(SSL_KEYSTORE);
         sslKeyAlias = (String) options.get(SSL_KEYALIAS);
         sslTrustStore = (String) options.get(SSL_TRUSTSTORE);
-        sslTimeout = (Integer) options.get(SSL_TIMEOUT);
+        if (options.get(SSL_TIMEOUT) != null) {
+            sslTimeout = (Integer) options.get(SSL_TIMEOUT);
+        }
     }
 
     public boolean login() throws LoginException {



Mime
View raw message