You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ka...@apache.org on 2010/10/29 17:51:00 UTC

svn commit: r1028811 - in /directory: apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/ shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/

Author: kayyagari
Date: Fri Oct 29 15:51:00 2010
New Revision: 1028811

URL: http://svn.apache.org/viewvc?rev=1028811&view=rev
Log:
o removed the call to connect() from the startTls() method
o updated test case

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

Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java?rev=1028811&r1=1028810&r2=1028811&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java Fri Oct 29 15:51:00 2010
@@ -153,6 +153,7 @@ public class LdapSSLConnectionTest exten
         try
         {
             connection = new LdapNetworkConnection( tlsConfig );
+            connection.connect();
             connection.startTls();
             BindResponse bindResponse = connection.bind( "uid=admin,ou=system", "secret" );
 
@@ -171,6 +172,7 @@ public class LdapSSLConnectionTest exten
     public void testGetSupportedControlsWithStartTLS() throws Exception
     {
         LdapNetworkConnection connection = new LdapNetworkConnection( tlsConfig );
+        connection.connect();
         connection.startTls();
         
         DN dn = new DN( "uid=admin,ou=system" );

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=1028811&r1=1028810&r2=1028811&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 Fri Oct 29 15:51:00 2010
@@ -3420,8 +3420,6 @@ public class LdapNetworkConnection exten
     {
         try
         {
-            connect();
-
             checkSession();
 
             ExtendedResponse resp = extended( START_TLS_REQ_OID );