jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From resc...@apache.org
Subject svn commit: r1186285 - /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManagerBase.java
Date Wed, 19 Oct 2011 15:50:35 GMT
Author: reschke
Date: Wed Oct 19 15:50:35 2011
New Revision: 1186285

URL: http://svn.apache.org/viewvc?rev=1186285&view=rev
Log:
JCR-3115: Versioning fixup leaves persistence in a state where the node can't be made versionable
again

Augment another InconsistentVersioningState exception with the VH node ID

Modified:
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManagerBase.java

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManagerBase.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManagerBase.java?rev=1186285&r1=1186284&r2=1186285&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManagerBase.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManagerBase.java
Wed Oct 19 15:50:35 2011
@@ -325,7 +325,8 @@ abstract class InternalVersionManagerBas
                 }
                 ChildNodeEntry rootv = history.getState().getChildNodeEntry(JCR_ROOTVERSION,
1);
                 if (rootv == null) {
-                    throw new InconsistentVersioningState("missing child node entry for "
+ JCR_ROOTVERSION + " on version history node " + history.getNodeId());
+                    throw new InconsistentVersioningState("missing child node entry for "
+ JCR_ROOTVERSION + " on version history node " + history.getNodeId(),
+                            history.getNodeId(), null);
                 }
                 info = new VersionHistoryInfo(history.getNodeId(),
                         rootv.getId());



Mime
View raw message