You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by to...@apache.org on 2016/05/10 14:37:07 UTC

svn commit: r1743198 - /jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/version/VersionablePropertiesEditor.java

Author: tomekr
Date: Tue May 10 14:37:07 2016
New Revision: 1743198

URL: http://svn.apache.org/viewvc?rev=1743198&view=rev
Log:
OAK-4166: Simple versionable nodes are invalid after migration
Don't use the diamond operator, as it breaks the Javadocs compiler.

Modified:
    jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/version/VersionablePropertiesEditor.java

Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/version/VersionablePropertiesEditor.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/version/VersionablePropertiesEditor.java?rev=1743198&r1=1743197&r2=1743198&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/version/VersionablePropertiesEditor.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/version/VersionablePropertiesEditor.java Tue May 10 14:37:07 2016
@@ -139,7 +139,7 @@ public final class VersionableProperties
             return;
         }
 
-        Set<String> updated = new HashSet<>();
+        Set<String> updated = new HashSet<String>();
         if (!node.hasProperty(JCR_VERSIONHISTORY)) {
             node.setProperty(JCR_VERSIONHISTORY, versionHistory.getString(JCR_UUID), REFERENCE);
             updated.add(JCR_VERSIONHISTORY);
@@ -155,7 +155,7 @@ public final class VersionableProperties
         if (!node.hasProperty(JCR_PREDECESSORS)) {
             baseVersion = baseVersion == null ? getLastVersion(versionHistory) : baseVersion;
 
-            List<String> predecessors = new ArrayList<>();
+            List<String> predecessors = new ArrayList<String>();
             if (node.getBoolean(JCR_ISCHECKEDOUT)) {
                 predecessors.add(baseVersion);
             }