Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 81292 invoked from network); 21 Aug 2006 00:47:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 21 Aug 2006 00:47:17 -0000 Received: (qmail 25713 invoked by uid 500); 21 Aug 2006 00:47:17 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 25660 invoked by uid 500); 21 Aug 2006 00:47:17 -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 25649 invoked by uid 99); 21 Aug 2006 00:47:17 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 20 Aug 2006 17:47:17 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 20 Aug 2006 17:47:16 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 0C82D1A981A; Sun, 20 Aug 2006 17:46:56 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r433108 - in /directory/trunks/apacheds: core/src/main/java/org/apache/directory/server/core/schema/ server-unit/src/test/java/org/apache/directory/server/ Date: Mon, 21 Aug 2006 00:46:55 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060821004656.0C82D1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: akarasulu Date: Sun Aug 20 17:46:54 2006 New Revision: 433108 URL: http://svn.apache.org/viewvc?rev=433108&view=rev Log: Fix for DIRSERVER-646: Replacing an unknown attribute with no values (deletion) causes an error Added: directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/ModifyReplaceITest.java - copied unchanged from r433107, directory/branches/apacheds/1.0/server-unit/src/test/java/org/apache/directory/server/ModifyReplaceITest.java Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/AddingEntriesWithSpecialCharactersInRDNTest.java Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java?rev=433108&r1=433107&r2=433108&view=diff ============================================================================== --- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java (original) +++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java Sun Aug 20 17:46:54 2006 @@ -821,6 +821,19 @@ ObjectClassRegistry ocRegistry = this.globalRegistries.getObjectClassRegistry(); AttributeTypeRegistry atRegistry = this.globalRegistries.getAttributeTypeRegistry(); + // ------------------------------------------------------------------- + // DIRSERVER-646 Fix: Replacing an unknown attribute with no values + // (deletion) causes an error + // ------------------------------------------------------------------- + + if ( mods.length == 1 && + mods[0].getAttribute().size() == 0 && + mods[0].getModificationOp() == DirContext.REPLACE_ATTRIBUTE && + ! atRegistry.hasAttributeType( mods[0].getAttribute().getID() ) ) + { + return; + } + // Now, apply the modifications on the cloned entry before applyong it to the // real object. for ( int ii = 0; ii < mods.length; ii++ ) Modified: directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/AddingEntriesWithSpecialCharactersInRDNTest.java URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/AddingEntriesWithSpecialCharactersInRDNTest.java?rev=433108&r1=433107&r2=433108&view=diff ============================================================================== --- directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/AddingEntriesWithSpecialCharactersInRDNTest.java (original) +++ directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/AddingEntriesWithSpecialCharactersInRDNTest.java Sun Aug 20 17:46:54 2006 @@ -13,11 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. * - */package org.apache.directory.server; + */ +package org.apache.directory.server; + import java.util.Hashtable; -import javax.naming.Context; import javax.naming.NamingEnumeration; import javax.naming.NamingException; import javax.naming.directory.Attribute; @@ -31,7 +32,6 @@ import org.apache.directory.server.unit.AbstractServerTest; -import junit.framework.TestCase; /** * Test case to demonstrate DIRSERVER-631 ("Creation of entry with special (and