directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject [directory-ldap-api] branch master updated: o Added the <scope>test</scope> foe the junit dependency where it's missing o Modified the get/setConnectionConfig() methods name for clarity
Date Tue, 07 May 2019 23:30:33 GMT
This is an automated email from the ASF dual-hosted git repository.

elecharny pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-ldap-api.git


The following commit(s) were added to refs/heads/master by this push:
     new ccb6586  o Added the <scope>test</scope> foe the junit dependency where
it's missing o Modified the get/setConnectionConfig() methods name for clarity
ccb6586 is described below

commit ccb658674ec25d07420897cbf25ebb199831393f
Author: emmanuel lecharny <elecharny@apache.org>
AuthorDate: Wed May 8 01:30:28 2019 +0200

    o Added the <scope>test</scope> foe the junit dependency where it's
    missing
    o Modified the get/setConnectionConfig() methods name for clarity
---
 integ-osgi/pom.xml                                   |  1 +
 .../ldap/client/api/LdapNetworkConnection.java       | 20 ++++++++++----------
 pom.xml                                              |  1 +
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/integ-osgi/pom.xml b/integ-osgi/pom.xml
index f483f46..7723343 100644
--- a/integ-osgi/pom.xml
+++ b/integ-osgi/pom.xml
@@ -94,6 +94,7 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
+      <scope>test</scope>
     </dependency>
 
     <dependency>
diff --git a/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
b/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
index a2b2747..7c86a16 100644
--- a/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
+++ b/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
@@ -198,8 +198,8 @@ public class LdapNetworkConnection extends AbstractLdapConnection implements
Lda
     /** configuration object for the connection */
     private LdapConnectionConfig config;
     
-    /** The Sockect configuratio */
-    private SocketSessionConfig connectionConfig;
+    /** The Socket configuration */
+    private SocketSessionConfig socketSessionConfig;
 
     /** The connector open with the remote server */
     private IoConnector connector;
@@ -501,9 +501,9 @@ public class LdapNetworkConnection extends AbstractLdapConnection implements
Lda
         // Use only one thread inside the connector
         connector = new NioSocketConnector( 1 );
         
-        if ( connectionConfig != null )
+        if ( socketSessionConfig != null )
         {
-            ( ( SocketSessionConfig ) connector.getSessionConfig() ).setAll( connectionConfig
);
+            ( ( SocketSessionConfig ) connector.getSessionConfig() ).setAll( socketSessionConfig
);
         }
         else
         {
@@ -5294,20 +5294,20 @@ public class LdapNetworkConnection extends AbstractLdapConnection
implements Lda
 
 
     /**
-     * @return the connectionConfig
+     * @return the socketSessionConfig
      */
-    public SocketSessionConfig getConnectionConfig()
+    public SocketSessionConfig getSocketSessionConfig()
     {
-        return connectionConfig;
+        return socketSessionConfig;
     }
 
 
     /**
-     * @param connectionConfig the connectionConfig to set
+     * @param socketSessionConfig the socketSessionConfig to set
      */
-    public void setConnectionConfig( SocketSessionConfig connectionConfig )
+    public void setSocketSessionConfig( SocketSessionConfig socketSessionConfig )
     {
-        this.connectionConfig = connectionConfig;
+        this.socketSessionConfig = socketSessionConfig;
     }
     
     
diff --git a/pom.xml b/pom.xml
index da462e8..dace679 100644
--- a/pom.xml
+++ b/pom.xml
@@ -615,6 +615,7 @@
         <groupId>org.junit.jupiter</groupId>
         <artifactId>junit-jupiter-engine</artifactId>
         <version>${junit.engine.version}</version>
+        <scope>test</scope>
       </dependency>
       
       <dependency>


Mime
View raw message