You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2011/10/21 15:49:55 UTC
svn commit: r1187344 -
/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryChecker.java
Author: reschke
Date: Fri Oct 21 13:49:55 2011
New Revision: 1187344
URL: http://svn.apache.org/viewvc?rev=1187344&view=rev
Log:
JCR-3115: Versioning fixup leaves persistence in a state where the node can't be made versionable again
Modify checker to also inspect "candidate" version histories.
Modified:
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryChecker.java
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryChecker.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryChecker.java?rev=1187344&r1=1187343&r2=1187344&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryChecker.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryChecker.java Fri Oct 21 13:49:55 2011
@@ -28,6 +28,7 @@ import java.util.Calendar;
import java.util.HashSet;
import java.util.Set;
+import javax.jcr.ItemNotFoundException;
import javax.jcr.RepositoryException;
import org.apache.jackrabbit.core.id.NodeId;
@@ -122,28 +123,49 @@ class RepositoryChecker {
}
private void checkVersionHistory(NodeState node) {
- if (node.hasPropertyName(JCR_VERSIONHISTORY)) {
- String message = null;
- NodeId nid = node.getNodeId();
- NodeId vhid = null;
- try {
- log.debug("Checking version history of node {}", nid);
+ String message = null;
+ NodeId nid = node.getNodeId();
+ boolean isVersioned = node.hasPropertyName(JCR_VERSIONHISTORY);
- String intro = "Removing references to an inconsistent version history of node "
- + nid;
+ NodeId vhid = null;
- message = intro + " (getting the VersionInfo)";
- VersionHistoryInfo vhi = versionManager.getVersionHistoryInfoForNode(node);
- if (vhi != null) {
- // get the version history's node ID as early as possible
- // so we can attempt a fixup even when the next call fails
- vhid = vhi.getVersionHistoryId();
- }
+ try {
+ String type = isVersioned ? "in-use" : "candidate";
+
+ log.debug("Checking " + type + " version history of node {}", nid);
+
+ String intro = "Removing references to an inconsistent " + type
+ + " version history of node " + nid;
+
+ message = intro + " (getting the VersionInfo)";
+ VersionHistoryInfo vhi = versionManager.getVersionHistoryInfoForNode(node);
+ if (vhi != null) {
+ // get the version history's node ID as early as possible
+ // so we can attempt a fixup even when the next call fails
+ vhid = vhi.getVersionHistoryId();
+ }
+
+ message = intro + " (getting the InternalVersionHistory)";
- message = intro + " (getting the InternalVersionHistory)";
- InternalVersionHistory vh = versionManager.getVersionHistoryOfNode(nid);
+ InternalVersionHistory vh = null;
+
+ try {
+ vh = versionManager.getVersionHistoryOfNode(nid);
+ }
+ catch (ItemNotFoundException ex) {
+ // it's ok if we get here if the node didn't claim to be versioned
+ if (isVersioned) {
+ throw ex;
+ }
+ }
+ if (vh == null) {
+ if (isVersioned) {
+ message = intro + "getVersionHistoryOfNode returned null";
+ throw new InconsistentVersioningState(message);
+ }
+ } else {
vhid = vh.getId();
// additional checks, see JCR-3101
@@ -162,34 +184,34 @@ class RepositoryChecker {
message = intro + "(frozen node of root version " + v.getId() + " missing)";
if (null == v.getFrozenNode()) {
- throw new InconsistentVersioningState("frozen node of "
- + v.getId() + " is missing.");
+ throw new InconsistentVersioningState(message);
}
}
if (!seenRoot) {
message = intro + " (root version is missing)";
- throw new InconsistentVersioningState("root version of " + nid +" is missing.");
+ throw new InconsistentVersioningState(message);
}
- } catch (InconsistentVersioningState e) {
- log.info(message, e);
- NodeId nvhid = e.getVersionHistoryNodeId();
- if (nvhid != null) {
- if (vhid != null && !nvhid.equals(vhid)) {
- log.error("vhrid returned with InconsistentVersioningState does not match the id we already had: "
- + vhid + " vs " + nvhid);
- }
- vhid = nvhid;
+ }
+ } catch (InconsistentVersioningState e) {
+ log.info(message, e);
+ NodeId nvhid = e.getVersionHistoryNodeId();
+ if (nvhid != null) {
+ if (vhid != null && !nvhid.equals(vhid)) {
+ log.error("vhrid returned with InconsistentVersioningState does not match the id we already had: "
+ + vhid + " vs " + nvhid);
}
- removeVersionHistoryReferences(node, vhid);
- } catch (Exception e) {
- log.info(message, e);
- removeVersionHistoryReferences(node, vhid);
+ vhid = nvhid;
}
+ removeVersionHistoryReferences(node, vhid);
+ } catch (Exception e) {
+ log.info(message, e);
+ removeVersionHistoryReferences(node, vhid);
}
}
- private void removeVersionHistoryReferences(NodeState node, NodeId vhid) {
+ // un-versions the node, and potentially moves the version history away
+ private void removeVersionHistoryReferences(NodeState node, NodeId vhid) {
NodeState modified =
new NodeState(node, NodeState.STATUS_EXISTING_MODIFIED, true);