directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1292592 - /directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/DefaultSchemaLoader.java
Date Thu, 23 Feb 2012 00:05:28 GMT
Author: elecharny
Date: Thu Feb 23 00:05:28 2012
New Revision: 1292592

URL: http://svn.apache.org/viewvc?rev=1292592&view=rev
Log:
Fixed the detection of the remote server vendor in the DefaultSchemaLoader

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

Modified: directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/DefaultSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/DefaultSchemaLoader.java?rev=1292592&r1=1292591&r2=1292592&view=diff
==============================================================================
--- directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/DefaultSchemaLoader.java
(original)
+++ directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/DefaultSchemaLoader.java
Thu Feb 23 00:05:28 2012
@@ -132,7 +132,7 @@ public class DefaultSchemaLoader extends
             }
 
             // Getting the subschemaSubentry DN from the rootDSE
-            Entry rootDse = connection.lookup( Dn.ROOT_DSE, SchemaConstants.SUBSCHEMA_SUBENTRY_AT
);
+            Entry rootDse = connection.lookup( Dn.ROOT_DSE, SchemaConstants.SUBSCHEMA_SUBENTRY_AT,
SchemaConstants.VENDOR_NAME_AT );
 
             if ( rootDse != null )
             {
@@ -186,13 +186,13 @@ public class DefaultSchemaLoader extends
      * @param rootDse the Root DSE
      * @return <code>true</code> if this is an ApacheDS server,
      *         <code>false</code> if not.
-     * @throws LdapInvalidAttributeValueException 
+     * @throws LdapInvalidAttributeValueException
      */
     private boolean isApacheDs( Entry rootDse ) throws LdapInvalidAttributeValueException
     {
         if ( rootDse != null )
         {
-            Attribute vendorNameAttribute = rootDse.get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT
);
+            Attribute vendorNameAttribute = rootDse.get( SchemaConstants.VENDOR_NAME_AT );
 
             if ( ( vendorNameAttribute != null ) && vendorNameAttribute.size() ==
1 )
             {



Mime
View raw message