svn commit: r1755207 - in /manifoldcf/trunk: CHANGES.txt connectors/ldap/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/ldap/LDAPAuthority.java

[kwright]

Author: kwright
Date: Thu Aug  4 16:37:43 2016
New Revision: 1755207

URL: http://svn.apache.org/viewvc?rev=1755207&view=rev
Log:
Fix for CONNECTORS-1331.  Committed on behalf of Furkan KAMACI

Modified:
    manifoldcf/trunk/CHANGES.txt
    
manifoldcf/trunk/connectors/ldap/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/ldap/LDAPAuthority.java

Modified: manifoldcf/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1755207&r1=1755206&r2=1755207&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Thu Aug  4 16:37:43 2016
@@ -3,6 +3,9 @@ $Id$
 
 ======================= 2.5-dev =====================
 
+CONNECTORS-1331: Do not set SSL socket factory unless SSL.
+(Furkan KAMACI)
+
 CONNECTORS-1330: Minor refactoring of LDAP connector.
 (Furkan KAMACI)
 

Modified: 
manifoldcf/trunk/connectors/ldap/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/ldap/LDAPAuthority.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/ldap/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/ldap/LDAPAuthority.java?rev=1755207&r1=1755206&r2=1755207&view=diff
==============================================================================
--- 
manifoldcf/trunk/connectors/ldap/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/ldap/LDAPAuthority.java
 (original)
+++ 
manifoldcf/trunk/connectors/ldap/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/ldap/LDAPAuthority.java
 Thu Aug  4 16:37:43 2016
@@ -220,12 +220,13 @@ public class LDAPAuthority extends org.a
         }
         
       } else {
-        // Set thread local for keystore stuff
-        LDAPSSLSocketFactory.setSocketFactoryProducer(sslKeystore);
+        if (isLDAPS(ldapProtocol)) {
+          // Set thread local for keystore stuff
+          LDAPSSLSocketFactory.setSocketFactoryProducer(sslKeystore);
+        }
         session.reconnect(null);
       }
-      sessionExpirationTime = System.currentTimeMillis() + 300000L;
-      return session;
+      sessionExpirationTime = System.currentTimeMillis() + 300000L;      
return session;
     } catch (AuthenticationException e) {
       session = null;
       sessionExpirationTime = -1L;