You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2008/07/24 16:36:52 UTC
svn commit: r679425 - in /jackrabbit/branches/1.4: ./ jackrabbit-core/
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/
Author: jukka
Date: Thu Jul 24 07:36:51 2008
New Revision: 679425
URL: http://svn.apache.org/viewvc?rev=679425&view=rev
Log:
1.4: Merged revision 679389 (JCR-1632)
Modified:
jackrabbit/branches/1.4/ (props changed)
jackrabbit/branches/1.4/jackrabbit-core/ (props changed)
jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/AbstractBundlePersistenceManager.java
jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/BundleBinding.java
Propchange: jackrabbit/branches/1.4/
------------------------------------------------------------------------------
svn:mergeinfo = /jackrabbit/trunk:679389
Propchange: jackrabbit/branches/1.4/jackrabbit-core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 24 07:36:51 2008
@@ -1 +1 @@
-/jackrabbit/trunk/jackrabbit-core:653417,654078,654514,655917,656240,656655,656664,658583
+/jackrabbit/trunk/jackrabbit-core:653417,654078,654514,655917,656240,656655,656664,658583,679389
Modified: jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/AbstractBundlePersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/AbstractBundlePersistenceManager.java?rev=679425&r1=679424&r2=679425&view=diff
==============================================================================
--- jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/AbstractBundlePersistenceManager.java (original)
+++ jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/AbstractBundlePersistenceManager.java Thu Jul 24 07:36:51 2008
@@ -563,7 +563,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/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/BundleBinding.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/BundleBinding.java?rev=679425&r1=679424&r2=679425&view=diff
==============================================================================
--- jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/BundleBinding.java (original)
+++ jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/BundleBinding.java Thu Jul 24 07:36:51 2008
@@ -30,6 +30,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);
@@ -265,6 +272,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);