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 2012/07/18 15:11:57 UTC
svn commit: r1362932 - in /jackrabbit/branches/2.2: ./
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManagerBase.java
Author: reschke
Date: Wed Jul 18 13:11:56 2012
New Revision: 1362932
URL: http://svn.apache.org/viewvc?rev=1362932&view=rev
Log:
JCR-3393: InternalVersionManagerBase.calculateCheckinVersionName may fail with NPE on broken versioning persistence
Modified:
jackrabbit/branches/2.2/ (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManagerBase.java
Propchange: jackrabbit/branches/2.2/
------------------------------------------------------------------------------
Merged /jackrabbit/trunk:r1362924
Modified: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManagerBase.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManagerBase.java?rev=1362932&r1=1362931&r2=1362932&view=diff
==============================================================================
--- jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManagerBase.java (original)
+++ jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManagerBase.java Wed Jul 18 13:11:56 2012
@@ -694,6 +694,13 @@ abstract class InternalVersionManagerBas
protected String calculateCheckinVersionName(InternalVersionHistoryImpl history,
NodeStateEx node, boolean simple)
throws RepositoryException {
+
+ if (history == null) {
+ String message = "Node " + node.getNodeId() + " has no version history";
+ log.error(message);
+ throw new VersionException(message);
+ }
+
InternalVersion best = null;
if (simple) {
// 1. in simple versioning just take the 'head' version
@@ -716,12 +723,24 @@ abstract class InternalVersionManagerBas
for (InternalValue value: values) {
InternalVersion pred = history.getVersion(value.getNodeId());
+ if (pred == null) {
+ String message = "Could not instantiate InternalVersion for nodeId " + value.getNodeId() + " (VHR + " + history.getId() + ", node " + node.getNodeId() + ")";
+ log.error(message);
+ throw new VersionException(message);
+ }
if (best == null
|| pred.getName().getLocalName().length() < best.getName().getLocalName().length()) {
best = pred;
}
}
}
+
+ if (best == null) {
+ String message = "Could not find 'best' predecessor node for " + node.getNodeId();
+ log.error(message);
+ throw new VersionException(message);
+ }
+
// 2. generate version name (assume no namespaces in version names)
String versionName = best.getName().getLocalName();
int pos = versionName.lastIndexOf('.');