svn commit: r819188 - /directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java

Author: elecharny
Date: Sat Sep 26 18:13:41 2009
New Revision: 819188

URL: http://svn.apache.org/viewvc?rev=819188&view=rev
Log:
Renamed a method for clarity sake

Modified:
    
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java

Modified: 
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
URL: 
http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java?rev=819188&r1=819187&r2=819188&view=diff
==============================================================================
--- 
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
 (original)
+++ 
directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
 Sat Sep 26 18:13:41 2009
@@ -1187,9 +1187,9 @@
     
     
     /**
-     * Modify an entry, applying the given modifications.
+     * Modify an entry, applying the given modifications, and check if it's OK
      */
-    private ServerEntry modifyEntry( LdapDN dn, ServerEntry currentEntry, 
List<Modification> mods ) throws Exception
+    private void checkModifyEntry( LdapDN dn, ServerEntry currentEntry, 
List<Modification> mods ) throws Exception
     {
         // The first step is to check that the modifications are valid :
         // - the ATs are present in the schema
@@ -1358,8 +1358,6 @@
         // - all the attribute are in MUST and MAY, except fo the 
extensibleObeject OC
         // is present
         check( dn, tempEntry );
-        
-        return tempEntry;
     }
 
     
@@ -1384,7 +1382,6 @@
         // First, check that the entry is either a subschemaSubentry or a 
schema element.
         // This is the case if it's a child of cn=schema or ou=schema
         LdapDN dn = opContext.getDn();
-        ServerEntry targetEntry = null;
         
         // Gets the stored entry on which the modification must be applied
         if ( dn.equals( subschemaSubentryDn ) )
@@ -1396,10 +1393,8 @@
             
             return;
         }
-        else
-        {
-            targetEntry = modifyEntry( dn, opContext.getEntry(), 
opContext.getModItems() );
-        }
+
+        checkModifyEntry( dn, opContext.getEntry(), opContext.getModItems() );
         
         next.modify( opContext );
     }