jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r792156 - /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleDbPersistenceManager.java
Date Wed, 08 Jul 2009 14:20:55 GMT
Author: jukka
Date: Wed Jul  8 14:20:55 2009
New Revision: 792156

URL: http://svn.apache.org/viewvc?rev=792156&view=rev
Log:
JCR-2169: BundleDbPersistenceManager consistencyFix doesn't fix missing non system childnode
entries of the root node

Patch contributed by Bart van der Schans.

Modified:
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleDbPersistenceManager.java

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleDbPersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleDbPersistenceManager.java?rev=792156&r1=792155&r2=792156&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleDbPersistenceManager.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleDbPersistenceManager.java
Wed Jul  8 14:20:55 2009
@@ -714,6 +714,12 @@
                                           boolean fix, Collection<NodePropBundle> modifications)
{
         //log.info(name + ": checking bundle '" + id + "'");
 
+        // skip all system nodes except root node
+        if (id.toString().endsWith("babecafebabe")
+                && !id.toString().equals("cafebabe-cafe-babe-cafe-babecafebabe"))
{
+            return;
+        }
+
         // look at the node's children
         Collection<NodePropBundle.ChildNodeEntry> missingChildren = new ArrayList<NodePropBundle.ChildNodeEntry>();
         for (NodePropBundle.ChildNodeEntry entry : bundle.getChildNodeEntries()) {
@@ -722,9 +728,6 @@
             if (entry.getId().toString().endsWith("babecafebabe")) {
                 continue;
             }
-            if (id.toString().endsWith("babecafebabe")) {
-                continue;
-            }
 
             try {
                 // analyze child node bundles



Mime
View raw message