From commits-return-3542-apmail-jackrabbit-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org Wed Jan 17 14:01:39 2007 Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 4207 invoked from network); 17 Jan 2007 14:01:37 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 17 Jan 2007 14:01:37 -0000 Received: (qmail 21294 invoked by uid 500); 17 Jan 2007 14:01:37 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 21265 invoked by uid 500); 17 Jan 2007 14:01:37 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 21251 invoked by uid 99); 17 Jan 2007 14:01:37 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Jan 2007 06:01:37 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Jan 2007 06:01:30 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 64AB11A981A; Wed, 17 Jan 2007 06:00:26 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r497023 - /jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/PropertyState.java Date: Wed, 17 Jan 2007 14:00:26 -0000 To: commits@jackrabbit.apache.org From: angela@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070117140026.64AB11A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: angela Date: Wed Jan 17 06:00:25 2007 New Revision: 497023 URL: http://svn.apache.org/viewvc?view=rev&rev=497023 Log: work in progress - minor improvement Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/PropertyState.java Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/PropertyState.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/PropertyState.java?view=diff&rev=497023&r1=497022&r2=497023 ============================================================================== --- jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/PropertyState.java (original) +++ jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/PropertyState.java Wed Jan 17 06:00:25 2007 @@ -21,8 +21,8 @@ import javax.jcr.RepositoryException; import javax.jcr.nodetype.ConstraintViolationException; -import org.apache.jackrabbit.spi.QPropertyDefinition; import org.apache.jackrabbit.name.QName; +import org.apache.jackrabbit.spi.QPropertyDefinition; import org.apache.jackrabbit.spi.PropertyId; import org.apache.jackrabbit.spi.ItemId; import org.apache.jackrabbit.spi.IdFactory; @@ -191,7 +191,7 @@ * @see ItemState#merge(ItemState, boolean) */ boolean merge(ItemState another, boolean keepChanges) { - if (another == null) { + if (another == null || another == this) { return false; } if (another.isNode()) { @@ -354,7 +354,7 @@ checkIsSessionState(); // make sure the arguements are consistent and do not violate the // given property definition. - validate(values, type, this.def); + validate(values, type, def); init(type, values); markModified();