You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by mr...@apache.org on 2017/03/15 14:32:19 UTC
svn commit: r1787054 - in /jackrabbit/branches/2.14: ./
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionHistoryImpl.java
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionImpl.java
Author: mreutegg
Date: Wed Mar 15 14:32:18 2017
New Revision: 1787054
URL: http://svn.apache.org/viewvc?rev=1787054&view=rev
Log:
JCR-4121: ConcurrentModificationException in InternalVersionHistoryImpl.fixLegacy()
Merged revision 1787043 from trunk
Modified:
jackrabbit/branches/2.14/ (props changed)
jackrabbit/branches/2.14/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionHistoryImpl.java
jackrabbit/branches/2.14/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionImpl.java
Propchange: jackrabbit/branches/2.14/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 15 14:32:18 2017
@@ -1,3 +1,3 @@
/jackrabbit/branches/JCR-2272:1173165-1176545
/jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1779166,1779460,1779614,1780208,1780220,1780406,1786325,1786330
+/jackrabbit/trunk:1779166,1779460,1779614,1780208,1780220,1780406,1786325,1786330,1787043
Modified: jackrabbit/branches/2.14/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionHistoryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.14/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionHistoryImpl.java?rev=1787054&r1=1787053&r2=1787054&view=diff
==============================================================================
--- jackrabbit/branches/2.14/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionHistoryImpl.java (original)
+++ jackrabbit/branches/2.14/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionHistoryImpl.java Wed Mar 15 14:32:18 2017
@@ -167,7 +167,7 @@ class InternalVersionHistoryImpl extends
// fix legacy
private void fixLegacy() throws RepositoryException {
if (rootVersion.getSuccessors().isEmpty()) {
- for (Name versionName : nameCache.keySet()) {
+ for (Name versionName : getVersionNames()) {
InternalVersionImpl v = createVersionInstance(versionName);
v.legacyResolveSuccessors();
}
Modified: jackrabbit/branches/2.14/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.14/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionImpl.java?rev=1787054&r1=1787053&r2=1787054&view=diff
==============================================================================
--- jackrabbit/branches/2.14/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionImpl.java (original)
+++ jackrabbit/branches/2.14/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionImpl.java Wed Mar 15 14:32:18 2017
@@ -441,7 +441,10 @@ class InternalVersionImpl extends Intern
for (InternalValue value : values) {
InternalVersionImpl v = (InternalVersionImpl)
versionHistory.getVersion(value.getNodeId());
- v.internalAddSuccessor(this, false);
+ // version may be null if history is broken
+ if (v != null) {
+ v.internalAddSuccessor(this, false);
+ }
}
}
}