directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1069449 - /directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java
Date Thu, 10 Feb 2011 16:11:57 GMT
Author: pamarcelot
Date: Thu Feb 10 16:11:57 2011
New Revision: 1069449

URL: http://svn.apache.org/viewvc?rev=1069449&view=rev
Log:
Fixed support of StartTLS in the LDAP API Connection Wrapper.

Modified:
    directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java

Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java?rev=1069449&r1=1069448&r2=1069449&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java
(original)
+++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java
Thu Feb 10 16:11:57 2011
@@ -143,7 +143,7 @@ public class DirectoryApiConnectionWrapp
         if ( ( connection.getEncryptionMethod() == EncryptionMethod.LDAPS )
             || ( connection.getEncryptionMethod() == EncryptionMethod.START_TLS ) )
         {
-            ldapConnectionConfig.setUseSsl( true );
+            ldapConnectionConfig.setUseSsl( connection.getEncryptionMethod() == EncryptionMethod.LDAPS
);
 
             try
             {
@@ -513,16 +513,16 @@ public class DirectoryApiConnectionWrapp
     {
         if ( controls != null )
         {
-            org.apache.directory.shared.ldap.model.message.Control[] returningControls =

+            org.apache.directory.shared.ldap.model.message.Control[] returningControls =
                 new org.apache.directory.shared.ldap.model.message.Control[controls.length];
 
             for ( int i = 0; i < controls.length; i++ )
             {
                 Control control = controls[i];
-                
+
                 org.apache.directory.shared.ldap.model.message.Control returningControl;
-                    returningControl = ldapConnection.getCodecService().fromJndiControl(
control );
-                
+                returningControl = ldapConnection.getCodecService().fromJndiControl( control
);
+
                 returningControls[i] = returningControl;
             }
 
@@ -653,7 +653,7 @@ public class DirectoryApiConnectionWrapp
             for ( ModificationItem modificationItem : modificationItems )
             {
                 Modification modification = new DefaultModification();
-                modification.setAttribute( AttributeUtils.toClientAttribute(modificationItem.getAttribute())
);
+                modification.setAttribute( AttributeUtils.toClientAttribute( modificationItem.getAttribute()
) );
                 modification.setOperation( convertModificationOperation( modificationItem.getModificationOp()
) );
                 modifications.add( modification );
             }



Mime
View raw message