You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2016/10/17 05:48:32 UTC

svn commit: r1765211 - /directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java

Author: elecharny
Date: Mon Oct 17 05:48:32 2016
New Revision: 1765211

URL: http://svn.apache.org/viewvc?rev=1765211&view=rev
Log:
Made it possible for users to inject a SocketSessionConfig object to override the default config. See DirAPI-207

Modified:
    directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java

Modified: directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java?rev=1765211&r1=1765210&r2=1765211&view=diff
==============================================================================
--- directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java (original)
+++ directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java Mon Oct 17 05:48:32 2016
@@ -193,6 +193,9 @@ public class LdapNetworkConnection exten
 
     /** configuration object for the connection */
     private LdapConnectionConfig config;
+    
+    /** The Sockect configuratio */
+    private SocketSessionConfig connectionConfig;
 
     /** The connector open with the remote server */
     private IoConnector connector;
@@ -527,8 +530,15 @@ public class LdapNetworkConnection exten
     {
         // Use only one thread inside the connector
         connector = new NioSocketConnector( 1 );
-
-        ( ( SocketSessionConfig ) connector.getSessionConfig() ).setReuseAddress( true );
+        
+        if ( connectionConfig != null )
+        {
+            ( ( SocketSessionConfig ) connector.getSessionConfig() ).setAll( connectionConfig );
+        }
+        else
+        {
+            ( ( SocketSessionConfig ) connector.getSessionConfig() ).setReuseAddress( true );
+        }
 
         // Add the codec to the chain
         connector.getFilterChain().addLast( "ldapCodec", ldapProtocolFilter );
@@ -4287,4 +4297,22 @@ public class LdapNetworkConnection exten
     {
         this.schemaManager = schemaManager;
     }
+
+
+    /**
+     * @return the connectionConfig
+     */
+    public SocketSessionConfig getConnectionConfig()
+    {
+        return connectionConfig;
+    }
+
+
+    /**
+     * @param connectionConfig the connectionConfig to set
+     */
+    public void setConnectionConfig( SocketSessionConfig connectionConfig )
+    {
+        this.connectionConfig = connectionConfig;
+    }
 }