directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r556417 - /directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/internal/model/JNDIConnectionContext.java
Date Sun, 15 Jul 2007 15:41:41 GMT
Author: seelmann
Date: Sun Jul 15 08:41:41 2007
New Revision: 556417

URL: http://svn.apache.org/viewvc?view=rev&rev=556417
Log:
Fix for DIRSTUDIO-149: Using LdapDN instead of the String DN.

Modified:
    directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/internal/model/JNDIConnectionContext.java

Modified: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/internal/model/JNDIConnectionContext.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/internal/model/JNDIConnectionContext.java?view=diff&rev=556417&r1=556416&r2=556417
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/internal/model/JNDIConnectionContext.java
(original)
+++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/internal/model/JNDIConnectionContext.java
Sun Jul 15 08:41:41 2007
@@ -40,6 +40,7 @@
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLSession;
 
+import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.studio.ldapbrowser.core.BrowserCoreMessages;
 import org.apache.directory.studio.ldapbrowser.core.jobs.ExtendedProgressMonitor;
 
@@ -218,7 +219,7 @@
 
                     try
                     {
-                        this.namingEnumeration = searchCtx.search( searchBase, filter, controls
);
+                        this.namingEnumeration = searchCtx.search( new LdapDN( searchBase
), filter, controls );
                     }
                     catch ( NamingException ne )
                     {
@@ -286,7 +287,7 @@
                     LdapContext modCtx = context.newInstance( controls );
                     modCtx.addToEnvironment( Context.REFERRAL, "throw" ); //$NON-NLS-1$
 
-                    modCtx.modifyAttributes( dn, modificationItems );
+                    modCtx.modifyAttributes( new LdapDN( dn ), modificationItems );
                 }
                 catch ( NamingException ne )
                 {
@@ -337,7 +338,7 @@
                     LdapContext modCtx = context.newInstance( controls );
                     modCtx.addToEnvironment( Context.REFERRAL, "throw" ); //$NON-NLS-1$
 
-                    modCtx.rename( oldDn, newDn );
+                    modCtx.rename( new LdapDN( oldDn ), new LdapDN( newDn ) );
 
                 }
                 catch ( NamingException ne )
@@ -389,7 +390,7 @@
                     LdapContext modCtx = context.newInstance( controls );
                     modCtx.addToEnvironment( Context.REFERRAL, "throw" ); //$NON-NLS-1$
 
-                    modCtx.createSubcontext( dn, attributes );
+                    modCtx.createSubcontext( new LdapDN( dn ), attributes );
                 }
                 catch ( NamingException ne )
                 {
@@ -440,7 +441,7 @@
                     LdapContext modCtx = context.newInstance( controls );
                     modCtx.addToEnvironment( Context.REFERRAL, "throw" ); //$NON-NLS-1$
 
-                    modCtx.destroySubcontext( dn );
+                    modCtx.destroySubcontext( new LdapDN( dn ) );
                 }
                 catch ( NamingException ne )
                 {



Mime
View raw message