directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r891320 - in /directory/shared/branches/shared-schema: ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/DefaultSchemaManager.java ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaManager.java
Date Wed, 16 Dec 2009 17:12:42 GMT
Author: elecharny
Date: Wed Dec 16 17:12:42 2009
New Revision: 891320

URL: http://svn.apache.org/viewvc?rev=891320&view=rev
Log:
Removed the useless method swapRegistries()

Modified:
    directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/DefaultSchemaManager.java
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaManager.java

Modified: directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/DefaultSchemaManager.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/DefaultSchemaManager.java?rev=891320&r1=891319&r2=891320&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/DefaultSchemaManager.java
(original)
+++ directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/DefaultSchemaManager.java
Wed Dec 16 17:12:42 2009
@@ -243,39 +243,6 @@
     //-----------------------------------------------------------------------
     // API methods
     //-----------------------------------------------------------------------
-    /***
-     * {@inheritDoc}
-     */
-    public boolean swapRegistries( Registries targetRegistries ) throws NamingException
-    {
-        // Check the resulting registries
-        errors = targetRegistries.checkRefInteg();
-
-        // if we have no more error, we can swap the registries
-        if ( errors.size() == 0 )
-        {
-            // Switch back to strict if needed
-            if ( registries.isStrict() )
-            {
-                targetRegistries.setStrict();
-            }
-
-            Registries oldRegistries = registries;
-            registries = targetRegistries;
-
-            // Delete the old registries to avoid memory leaks
-            oldRegistries.clear();
-
-            return true;
-        }
-        else
-        {
-            // We can't use this new registries.
-            return false;
-        }
-    }
-
-
     /**
      * {@inheritDoc}
      */

Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaManager.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaManager.java?rev=891320&r1=891319&r2=891320&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaManager.java
(original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaManager.java
Wed Dec 16 17:12:42 2009
@@ -607,17 +607,6 @@
     void setRegistries( Registries registries );
 
 
-    /***
-     * Swap the registries, deleting all the schemaObjects and links from the old one
-     * to avoid memory leaks.
-     * 
-     * @param targetRegistries The registries we want to store in place of the existing one
-     * @exception If something went wrong
-     * @return true if the replacement has been done
-     */
-    public boolean swapRegistries( Registries targetRegistries ) throws NamingException;
-
-
     /**
      * @return The errors obtained when checking the registries
      */



Mime
View raw message