Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 67950 invoked from network); 16 Dec 2009 17:13:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 16 Dec 2009 17:13:05 -0000 Received: (qmail 73027 invoked by uid 500); 16 Dec 2009 17:13:05 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 72967 invoked by uid 500); 16 Dec 2009 17:13:05 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 72958 invoked by uid 99); 16 Dec 2009 17:13:05 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Dec 2009 17:13:05 +0000 X-ASF-Spam-Status: No, hits=-3.8 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Dec 2009 17:13:03 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1E34723889E7; Wed, 16 Dec 2009 17:12:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091216171243.1E34723889E7@eris.apache.org> 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 */