directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r267346 - /directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/subtree/SubentryService.java
Date Fri, 02 Sep 2005 23:12:23 GMT
Author: akarasulu
Date: Fri Sep  2 16:12:19 2005
New Revision: 267346

URL: http://svn.apache.org/viewcvs?rev=267346&view=rev
Log:
broke a few tests by forgetting these changes - all passes now

Modified:
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/subtree/SubentryService.java

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/subtree/SubentryService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/subtree/SubentryService.java?rev=267346&r1=267345&r2=267346&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/subtree/SubentryService.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/subtree/SubentryService.java
Fri Sep  2 16:12:19 2005
@@ -100,6 +100,11 @@
         {
             Attribute objectClasses = result.getAttributes().get( "objectClass" );
 
+            if ( objectClasses == null )
+            {
+                return true;
+            }
+
             if ( objectClasses.contains( SUBENTRY_OBJECTCLASS ) || objectClasses.contains(
SUBENTRY_OBJECTCLASS_OID ) )
             {
                 return false;
@@ -406,6 +411,10 @@
                 }
             }
         }
+        else
+        {
+            next.add( upName, normName, entry );
+        }
     }
 
 
@@ -502,6 +511,10 @@
                     nexus.modify( dn, getOperationalModsForDelete( name, candidate ) );
                 }
             }
+        }
+        else
+        {
+            next.delete( name );
         }
     }
 



Mime
View raw message