Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 21024 invoked from network); 24 Jul 2008 12:31:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 24 Jul 2008 12:31:23 -0000 Received: (qmail 19317 invoked by uid 500); 24 Jul 2008 12:31:22 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 19283 invoked by uid 500); 24 Jul 2008 12:31:22 -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 19274 invoked by uid 99); 24 Jul 2008 12:31:22 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Jul 2008 05:31:22 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED 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; Thu, 24 Jul 2008 12:30:28 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1DF56238896C; Thu, 24 Jul 2008 05:30:54 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r679389 - in /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle: AbstractBundlePersistenceManager.java util/BundleBinding.java Date: Thu, 24 Jul 2008 12:30:53 -0000 To: commits@jackrabbit.apache.org From: stefan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080724123054.1DF56238896C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: stefan Date: Thu Jul 24 05:30:53 2008 New Revision: 679389 URL: http://svn.apache.org/viewvc?rev=679389&view=rev Log: JCR-1632: Mixin type loss Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/AbstractBundlePersistenceManager.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/BundleBinding.java Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/AbstractBundlePersistenceManager.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/AbstractBundlePersistenceManager.java?rev=679389&r1=679388&r2=679389&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/AbstractBundlePersistenceManager.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/AbstractBundlePersistenceManager.java Thu Jul 24 05:30:53 2008 @@ -562,7 +562,7 @@ bundle.update((NodeState) state); } else { PropertyId id = (PropertyId) state.getId(); - // skip primaryType pr mixinTypes properties + // skip redundant primaryType, mixinTypes and uuid properties if (id.getName().equals(NameConstants.JCR_PRIMARYTYPE) || id.getName().equals(NameConstants.JCR_MIXINTYPES) || id.getName().equals(NameConstants.JCR_UUID)) { Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/BundleBinding.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/BundleBinding.java?rev=679389&r1=679388&r2=679389&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/BundleBinding.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/BundleBinding.java Thu Jul 24 05:30:53 2008 @@ -31,6 +31,7 @@ import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.uuid.UUID; import org.apache.jackrabbit.spi.commons.name.NameFactoryImpl; +import org.apache.jackrabbit.spi.commons.name.NameConstants; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -114,6 +115,12 @@ // properties name = readIndexedQName(in); while (name != null) { + // skip redundant primaryType, mixinTypes and uuid properties + if (name.equals(NameConstants.JCR_PRIMARYTYPE) + || name.equals(NameConstants.JCR_MIXINTYPES) + || name.equals(NameConstants.JCR_UUID)) { + continue; + } PropertyId pId = new PropertyId(bundle.getId(), name); NodePropBundle.PropertyEntry pState = readPropertyEntry(in, pId); bundle.addProperty(pState); @@ -278,6 +285,12 @@ iter = bundle.getPropertyNames().iterator(); while (iter.hasNext()) { Name pName = (Name) iter.next(); + // skip redundant primaryType, mixinTypes and uuid properties + if (pName.equals(NameConstants.JCR_PRIMARYTYPE) + || pName.equals(NameConstants.JCR_MIXINTYPES) + || pName.equals(NameConstants.JCR_UUID)) { + continue; + } NodePropBundle.PropertyEntry pState = bundle.getPropertyEntry(pName); if (pState == null) { log.error("PropertyState missing in bundle: " + pName);