Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 98768 invoked from network); 22 Aug 2006 03:18:28 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 22 Aug 2006 03:18:28 -0000 Received: (qmail 5884 invoked by uid 500); 22 Aug 2006 03:18:28 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 5847 invoked by uid 500); 22 Aug 2006 03:18:28 -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 5836 invoked by uid 99); 22 Aug 2006 03:18:27 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Aug 2006 20:18:27 -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; Mon, 21 Aug 2006 20:18:27 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 0FC2C1A981A; Mon, 21 Aug 2006 20:18:07 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r433483 - in /directory/branches/apacheds/1.0: core/src/main/java/org/apache/directory/server/core/schema/ server-unit/src/test/java/org/apache/directory/server/ Date: Tue, 22 Aug 2006 03:18:06 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060822031807.0FC2C1A981A@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: Mon Aug 21 20:18:05 2006 New Revision: 433483 URL: http://svn.apache.org/viewvc?rev=433483&view=rev Log: fix for DIRSERVER-630 Added: directory/branches/apacheds/1.0/server-unit/src/test/java/org/apache/directory/server/IllegalModificationITest.java - copied, changed from r433475, directory/branches/apacheds/1.0/server-unit/src/test/java/org/apache/directory/server/IllegalModification.java Removed: directory/branches/apacheds/1.0/server-unit/src/test/java/org/apache/directory/server/IllegalModification.java Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java?rev=433483&r1=433482&r2=433483&view=diff ============================================================================== --- directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java (original) +++ directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java Mon Aug 21 20:18:05 2006 @@ -786,6 +786,17 @@ { objectClassMod = mods[ii]; } + + // Freak out under some weird cases + if ( mods[0].getAttribute().size() == 0 ) + { + // not ok for add but ok for replace and delete + if ( mods[0].getModificationOp() == DirContext.ADD_ATTRIBUTE ) + { + throw new LdapInvalidAttributeValueException( "No value is not a valid value for an attribute.", + ResultCodeEnum.INVALIDATTRIBUTESYNTAX ); + } + } StringBuffer keybuf = new StringBuffer(); keybuf.append( mods[ii].getModificationOp() ); Copied: directory/branches/apacheds/1.0/server-unit/src/test/java/org/apache/directory/server/IllegalModificationITest.java (from r433475, directory/branches/apacheds/1.0/server-unit/src/test/java/org/apache/directory/server/IllegalModification.java) URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/server-unit/src/test/java/org/apache/directory/server/IllegalModificationITest.java?p2=directory/branches/apacheds/1.0/server-unit/src/test/java/org/apache/directory/server/IllegalModificationITest.java&p1=directory/branches/apacheds/1.0/server-unit/src/test/java/org/apache/directory/server/IllegalModification.java&r1=433475&r2=433483&rev=433483&view=diff ============================================================================== --- directory/branches/apacheds/1.0/server-unit/src/test/java/org/apache/directory/server/IllegalModification.java (original) +++ directory/branches/apacheds/1.0/server-unit/src/test/java/org/apache/directory/server/IllegalModificationITest.java Mon Aug 21 20:18:05 2006 @@ -48,7 +48,7 @@ * @author Apache Directory Project * @version $Rev: $ */ -public class IllegalModification extends AbstractServerTest +public class IllegalModificationITest extends AbstractServerTest { static final String DN = "cn=Kate Bush,ou=system"; static final String USER = "uid=admin,ou=system"; @@ -93,7 +93,7 @@ try { - con.modify( "cn=Kate Bush,dc=example,dc=com", mod ); + con.modify( "cn=Kate Bush,ou=system", mod ); fail( "error expected due to empty attribute value" ); } catch ( LDAPException e ) @@ -103,7 +103,6 @@ // Check whether entry is unmodified, i.e. no description LDAPEntry entry = con.read( DN ); - System.err.println( entry ); assertEquals( "description exists?", null, entry.getAttribute( "description" ) ); } }