From commits-return-12202-apmail-jackrabbit-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org Mon Oct 10 15:37:52 2011 Return-Path: X-Original-To: apmail-jackrabbit-commits-archive@www.apache.org Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 033BE7C9F for ; Mon, 10 Oct 2011 15:37:52 +0000 (UTC) Received: (qmail 48570 invoked by uid 500); 10 Oct 2011 15:37:51 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 48534 invoked by uid 500); 10 Oct 2011 15:37:51 -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 48527 invoked by uid 99); 10 Oct 2011 15:37:51 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Oct 2011 15:37:51 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Mon, 10 Oct 2011 15:37:48 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 11C1623889E7; Mon, 10 Oct 2011 15:37:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1181024 - in /jackrabbit/branches/2.2: ./ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryChecker.java Date: Mon, 10 Oct 2011 15:37:26 -0000 To: commits@jackrabbit.apache.org From: reschke@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111010153727.11C1623889E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: reschke Date: Mon Oct 10 15:37:26 2011 New Revision: 1181024 URL: http://svn.apache.org/viewvc?rev=1181024&view=rev Log: JCR-3101: when checking version histories also check each individual version - ported to 2.2 Modified: jackrabbit/branches/2.2/ (props changed) jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryChecker.java Propchange: jackrabbit/branches/2.2/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 10 15:37:26 2011 @@ -3,4 +3,4 @@ /jackrabbit/sandbox/JCR-1456:774917-886178 /jackrabbit/sandbox/JCR-2170:812417-816332 /jackrabbit/sandbox/tripod-JCR-2209:795441-795863 -/jackrabbit/trunk:1038201,1038203,1038205,1038657,1039064,1039347,1039408,1039422-1039423,1039888,1039946,1040033,1040090,1040459,1040601,1040606,1040661,1040958,1041379,1041439,1041761,1042643,1042647,1042978-1042982,1043084-1043086,1043088,1043343,1043357-1043358,1043430,1043554,1043616,1043618,1043637,1043656,1043893,1043897,1044239,1044312,1044451,1044613,1049473,1049491,1049514,1049518,1049520,1049859,1049870,1049874,1049878,1049880,1049883,1049889,1049891,1049894-1049895,1049899-1049901,1049909-1049911,1049915-1049916,1049919,1049923,1049925,1049931,1049936,1049939,1050212,1050298,1050346,1050551,1055068,1055070-1055071,1055116-1055117,1055127,1055134,1055164,1055498,1060431,1060434,1060753,1063756,1064670,1065599,1065622,1066059,1066071,1069831,1071562,1071573,1071680,1074140,1079314,1079317,1080186,1080540,1087304,1088991,1089032,1089053,1089436,1092106,1092117,1092683,1097363,1097513-1097514,1098963-1098964,1099033,1099172,1100242,1100286,1101046,1102601,1104027,112 8175,1130192,1130228,1132993,1136353,1136360,1138511,1141141,1141717,1143396,1143738,1144332,1144338,1144695,1152258,1155431,1157175,1165609,1173196,1174822,1174887,1175988,1176423,1176465,1176515,1176546,1177249,1177340,1179548 +/jackrabbit/trunk:1038201,1038203,1038205,1038657,1039064,1039347,1039408,1039422-1039423,1039888,1039946,1040033,1040090,1040459,1040601,1040606,1040661,1040958,1041379,1041439,1041761,1042643,1042647,1042978-1042982,1043084-1043086,1043088,1043343,1043357-1043358,1043430,1043554,1043616,1043618,1043637,1043656,1043893,1043897,1044239,1044312,1044451,1044613,1049473,1049491,1049514,1049518,1049520,1049859,1049870,1049874,1049878,1049880,1049883,1049889,1049891,1049894-1049895,1049899-1049901,1049909-1049911,1049915-1049916,1049919,1049923,1049925,1049931,1049936,1049939,1050212,1050298,1050346,1050551,1055068,1055070-1055071,1055116-1055117,1055127,1055134,1055164,1055498,1060431,1060434,1060753,1063756,1064670,1065599,1065622,1066059,1066071,1069831,1071562,1071573,1071680,1074140,1079314,1079317,1080186,1080540,1087304,1088991,1089032,1089053,1089436,1092106,1092117,1092683,1097363,1097513-1097514,1098963-1098964,1099033,1099172,1100242,1100286,1101046,1102601,1104027,112 8175,1130192,1130228,1132993,1136353,1136360,1138511,1141141,1141717,1143396,1143738,1144332,1144338,1144695,1152258,1155431,1157175,1165609,1173196,1174822,1174887,1175988,1176423,1176465,1176515,1176546,1177249,1177340,1179548,1180922 Modified: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryChecker.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryChecker.java?rev=1181024&r1=1181023&r2=1181024&view=diff ============================================================================== --- jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryChecker.java (original) +++ jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryChecker.java Mon Oct 10 15:37:26 2011 @@ -20,6 +20,7 @@ import static org.apache.jackrabbit.core import static org.apache.jackrabbit.spi.commons.name.NameConstants.JCR_BASEVERSION; import static org.apache.jackrabbit.spi.commons.name.NameConstants.JCR_ISCHECKEDOUT; import static org.apache.jackrabbit.spi.commons.name.NameConstants.JCR_PREDECESSORS; +import static org.apache.jackrabbit.spi.commons.name.NameConstants.JCR_ROOTVERSION; import static org.apache.jackrabbit.spi.commons.name.NameConstants.JCR_VERSIONHISTORY; import static org.apache.jackrabbit.spi.commons.name.NameConstants.MIX_VERSIONABLE; @@ -35,6 +36,9 @@ import org.apache.jackrabbit.core.state. import org.apache.jackrabbit.core.state.ChildNodeEntry; import org.apache.jackrabbit.core.state.ItemStateException; import org.apache.jackrabbit.core.state.NodeState; +import org.apache.jackrabbit.core.version.InconsistentVersioningState; +import org.apache.jackrabbit.core.version.InternalVersion; +import org.apache.jackrabbit.core.version.InternalVersionHistory; import org.apache.jackrabbit.core.version.InternalVersionManager; import org.apache.jackrabbit.spi.Name; import org.slf4j.Logger; @@ -104,11 +108,44 @@ class RepositoryChecker { private void checkVersionHistory(NodeState node) { if (node.hasPropertyName(JCR_VERSIONHISTORY)) { - log.debug("Checking version history of node {}", node.getNodeId()); + String message = null; + NodeId nid = node.getNodeId(); + try { - versionManager.getVersionHistoryOfNode(node.getNodeId()); + log.debug("Checking version history of node {}", nid); + + message = "Removing references to a missing version history of node " + nid; + InternalVersionHistory vh = versionManager.getVersionHistoryOfNode(nid); + + // additional checks, see JCR-3101 + String intro = "Removing references to an inconsistent version history of node " + + nid; + + message = intro + " (getting the version names failed)"; + Name[] versionNames = vh.getVersionNames(); + boolean seenRoot = false; + + for (Name versionName : versionNames) { + seenRoot |= JCR_ROOTVERSION.equals(versionName); + + log.debug("Checking version history of node {}, version {}", nid, versionName); + + message = intro + " (getting version " + versionName + " failed)"; + InternalVersion v = vh.getVersion(versionName); + + message = intro + "(frozen node of root version " + v.getId() + " missing)"; + if (null == v.getFrozenNode()) { + throw new InconsistentVersioningState("frozen node of " + + v.getId() + " is missing."); + } + } + + if (!seenRoot) { + message = intro + " (root version is missing)"; + throw new InconsistentVersioningState("root version of " + nid +" is missing."); + } } catch (Exception e) { - log.info("Removing references to a missing version history", e); + log.info(message, e); removeVersionHistoryReferences(node); } }