directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1236162 - /directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/AbstractEntry.java
Date Thu, 26 Jan 2012 12:52:02 GMT
Author: pamarcelot
Date: Thu Jan 26 12:52:02 2012
New Revision: 1236162

URL: http://svn.apache.org/viewvc?rev=1236162&view=rev
Log:
Fix for DIRSTUDIO-733 (Error while reading RootDSE on Sun One directory server).

Modified:
    directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/AbstractEntry.java

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/AbstractEntry.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/AbstractEntry.java?rev=1236162&r1=1236161&r2=1236162&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/AbstractEntry.java
(original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/AbstractEntry.java
Thu Jan 26 12:52:02 2012
@@ -223,7 +223,8 @@ public abstract class AbstractEntry impl
             String oidString = attributeToDelete.getAttributeDescription().toOidString(
                 getBrowserConnection().getSchema() );
             AttributeInfo ai = getBrowserConnectionImpl().getAttributeInfo( this );
-            if ( ai != null && ai.attributeMap != null && ai.attributeMap.containsKey(
Strings.toLowerCase( oidString ) ) )
+            if ( ai != null && ai.attributeMap != null
+                && ai.attributeMap.containsKey( Strings.toLowerCase( oidString )
) )
             {
                 attributeToDelete = ( IAttribute ) ai.attributeMap.get( Strings.toLowerCase(
oidString ) );
                 ai.attributeMap.remove( Strings.toLowerCase( oidString ) );
@@ -556,7 +557,8 @@ public abstract class AbstractEntry impl
     {
         AttributeDescription ad = new AttributeDescription( attributeDescription );
         String oidString = ad.toOidString( getBrowserConnection().getSchema() );
-        if ( oidString.equals( SchemaConstants.OBJECT_CLASS_AT_OID ) )
+        if ( oidString.equals( SchemaConstants.OBJECT_CLASS_AT_OID )
+            || ( SchemaConstants.OBJECT_CLASS_AT.equalsIgnoreCase( attributeDescription )
) )
         {
             return objectClassAttribute;
         }



Mime
View raw message