Fix interpretation of LDAP timeout.

SVN: 28180

authentication/source/java/ch/systemsx/cisd/authentication/ldap/LDAPDirectoryConfiguration.java

@@ -328,13 +328,21 @@ public final class LDAPDirectoryConfiguration
     }
 
     /**
-     * The read timeout (in ms).
-     * Default value: <code>-1</code> (which means: wait forever)
+     * The read timeout (in s).
+     * Default value: <code>10s</code>
      */
     public String getTimeoutStr()
     {
         return Long.toString(timeout / 1000);
     }
+    
+    /**
+     * Returns the timeout (in ms)
+     */
+    public long getTimeout()
+    {
+        return timeout;
+    }
 
     /**
      * Set the read timeout as String in a format understood by

authentication/source/java/ch/systemsx/cisd/authentication/ldap/LDAPPrincipalQuery.java

@@ -399,8 +399,8 @@ public final class LDAPPrincipalQuery implements ISelfTestable
         env.put(Context.REFERRAL, config.getReferral());
         env.put(Context.SECURITY_PRINCIPAL, dn);
         env.put(Context.SECURITY_CREDENTIALS, password);
-        env.put(LDAP_CONTEXT_READ_TIMEOUT, config.getTimeoutStr());
-        env.put(LDAP_CONTEXT_CONNECT_TIMEOUT, config.getTimeoutStr());
+        env.put(LDAP_CONTEXT_READ_TIMEOUT, Long.toString(config.getTimeout()));
+        env.put(LDAP_CONTEXT_CONNECT_TIMEOUT, Long.toString(config.getTimeout()));
         if (operationLog.isDebugEnabled())
         {
             operationLog.debug(String.format("Try to login to %s with dn=%s",