jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r1591713 - /jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java
Date Thu, 01 May 2014 17:05:58 GMT
Author: jukka
Date: Thu May  1 17:05:58 2014
New Revision: 1591713

URL: http://svn.apache.org/r1591713
Log:
OAK-1789: Upgraded version history has UUIDs as jcr:frozenUuid of non-referenceable nodes

Need to initialize JackrabbitNodeState properties first before recursing to children for the
JCR_FROZENUUID parent lookups to work correctly.

Modified:
    jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java

Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java?rev=1591713&r1=1591712&r2=1591713&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java
(original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java
Thu May  1 17:05:58 2014
@@ -129,8 +129,8 @@ class JackrabbitNodeState extends Abstra
         this.isOrderable = parent.isOrderable;
         this.isFrozenNode = parent.isFrozenNode;
         this.uriToPrefix = parent.uriToPrefix;
-        this.nodes = createNodes(bundle);
         this.properties = createProperties(bundle);
+        this.nodes = createNodes(bundle);
         this.useBinaryReferences = parent.useBinaryReferences;
         logNewNode(this);
     }
@@ -149,8 +149,8 @@ class JackrabbitNodeState extends Abstra
         this.uriToPrefix = uriToPrefix;
         try {
             NodePropBundle bundle = loader.loadBundle(id);
-            this.nodes = createNodes(bundle);
             this.properties = createProperties(bundle);
+            this.nodes = createNodes(bundle);
         } catch (ItemStateException e) {
             throw new IllegalStateException("Unable to access node " + id, e);
         }



Mime
View raw message