Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 34867 invoked from network); 8 Jul 2009 14:21:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 8 Jul 2009 14:21:09 -0000 Received: (qmail 79976 invoked by uid 500); 8 Jul 2009 14:21:19 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 79908 invoked by uid 500); 8 Jul 2009 14:21:19 -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 79899 invoked by uid 99); 8 Jul 2009 14:21:19 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Jul 2009 14:21:19 +0000 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; Wed, 08 Jul 2009 14:21:17 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0552A2388872; Wed, 8 Jul 2009 14:20:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090708142056.0552A2388872@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 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 missingChildren = new ArrayList(); 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