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 re...@apache.org on 2015/08/05 15:51:59 UTC
svn commit: r1694215 - in /jackrabbit/oak/branches/1.2: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/
oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/
oak-run/src/main/java/org/apache/jackrabbit/oak/run/
Author: reschke
Date: Wed Aug 5 13:51:59 2015
New Revision: 1694215
URL: http://svn.apache.org/r1694215
Log:
OAK-2674: Fix FindBug Issues (ported to 1.2)
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/ReadOnlyVersionManager.java
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionableState.java
jackrabbit/oak/branches/1.2/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/ReadWriteVersionManager.java
jackrabbit/oak/branches/1.2/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 5 13:51:59 2015
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1682042,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618,1684820,1684868,1685023
,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691210,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693209,1693421,1693525-1693526,1694007
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1682042,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618,1684820,1684868
,1685023,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691210,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693209,1693421,1693525-1693526,1694007
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/ReadOnlyVersionManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/ReadOnlyVersionManager.java?rev=1694215&r1=1694214&r2=1694215&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/ReadOnlyVersionManager.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/ReadOnlyVersionManager.java Wed Aug 5 13:51:59 2015
@@ -205,8 +205,6 @@ public abstract class ReadOnlyVersionMan
*
* @param tree the tree to check.
* @return whether the {@code tree} is versionable.
- * @throws RepositoryException if an error occurs while checking the node
- * type of the tree.
*/
protected boolean isVersionable(@Nonnull Tree tree) {
return getNodeTypeManager().isNodeType(
Modified: jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionableState.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionableState.java?rev=1694215&r1=1694214&r2=1694215&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionableState.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionableState.java Wed Aug 5 13:51:59 2015
@@ -37,7 +37,6 @@ import static org.apache.jackrabbit.JcrC
import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE;
import static org.apache.jackrabbit.JcrConstants.JCR_UUID;
import static org.apache.jackrabbit.JcrConstants.JCR_VERSIONHISTORY;
-import static org.apache.jackrabbit.JcrConstants.MIX_REFERENCEABLE;
import static org.apache.jackrabbit.JcrConstants.MIX_VERSIONABLE;
import static org.apache.jackrabbit.JcrConstants.NT_FROZENNODE;
import static org.apache.jackrabbit.JcrConstants.NT_VERSIONEDCHILD;
@@ -569,16 +568,6 @@ class VersionableState {
}
}
- private boolean isReferenceable(NodeBuilder node)
- throws RepositoryException {
- if (!node.hasProperty(JCR_UUID)) {
- // quick check without looking at type hierarchy
- return false;
- }
- Tree tree = TreeFactory.createReadOnlyTree(node.getNodeState());
- return ntMgr.isNodeType(tree, MIX_REFERENCEABLE);
- }
-
private static boolean isHiddenProperty(@Nonnull String propName) {
return NodeStateUtils.isHidden(propName) && !TreeConstants.OAK_CHILD_ORDER.equals(propName);
}
@@ -630,7 +619,7 @@ class VersionableState {
@Override
public int getAction(NodeBuilder src,
NodeBuilder dest,
- PropertyState prop) throws RepositoryException {
+ PropertyState prop) {
return COPY;
}
}
Modified: jackrabbit/oak/branches/1.2/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/ReadWriteVersionManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/ReadWriteVersionManager.java?rev=1694215&r1=1694214&r2=1694215&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/ReadWriteVersionManager.java (original)
+++ jackrabbit/oak/branches/1.2/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/ReadWriteVersionManager.java Wed Aug 5 13:51:59 2015
@@ -115,9 +115,8 @@ public class ReadWriteVersionManager ext
versionable.getPath() + " is not versionable");
}
if (isCheckedOut(versionable)) {
- versionable.setProperty(JCR_ISCHECKEDOUT,
- Boolean.FALSE, Type.BOOLEAN);
- Tree baseVersion = getBaseVersion(versionable);
+ Tree baseVersion = getExistingBaseVersion(versionable);
+ versionable.setProperty(JCR_ISCHECKEDOUT, Boolean.FALSE, Type.BOOLEAN);
PropertyState created = baseVersion.getProperty(JCR_CREATED);
if (created != null) {
long c = ISO8601.parse(created.getValue(Type.DATE)).getTimeInMillis();
@@ -134,7 +133,7 @@ public class ReadWriteVersionManager ext
throw e.asRepositoryException();
}
}
- return getBaseVersion(getWorkspaceRoot().getTree(versionable.getPath()));
+ return getExistingBaseVersion(getWorkspaceRoot().getTree(versionable.getPath()));
}
/**
@@ -148,7 +147,7 @@ public class ReadWriteVersionManager ext
* @throws RepositoryException if an error occurs while checking the
* node type of the tree.
* @throws IllegalStateException if the workspaceRoot has pending changes.
- * @throws IllegalArgumentException if the <code>versionablePath</code> is
+ * @throws IllegalArgumentException if the {@code versionablePath} is
* not absolute.
*/
public void checkout(@Nonnull Root workspaceRoot,
@@ -228,7 +227,7 @@ public class ReadWriteVersionManager ext
@Nonnull String oakVersionName)
throws RepositoryException {
Tree versionHistory = TreeUtil.getTree(versionStorage.getTree(), versionHistoryOakRelPath);
- if (!versionHistory.exists()) {
+ if (versionHistory == null || !versionHistory.exists()) {
throw new VersionException("Version history " + versionHistoryOakRelPath + " does not exist on this version storage");
}
Tree version = versionHistory.getChild(oakVersionName);
@@ -246,4 +245,14 @@ public class ReadWriteVersionManager ext
}
// TODO: more methods that modify versions
+
+ //------------------------------------------------------------< private >---
+ @Nonnull
+ private Tree getExistingBaseVersion(@Nonnull Tree versionableTree) throws RepositoryException {
+ Tree baseVersion = getBaseVersion(versionableTree);
+ if (baseVersion == null) {
+ throw new IllegalStateException("Base version does not exist.");
+ }
+ return baseVersion;
+ }
}
Modified: jackrabbit/oak/branches/1.2/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java?rev=1694215&r1=1694214&r2=1694215&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java (original)
+++ jackrabbit/oak/branches/1.2/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java Wed Aug 5 13:51:59 2015
@@ -112,7 +112,7 @@ import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
-public class Main {
+public final class Main {
public static final int PORT = 8080;
public static final String URI = "http://localhost:" + PORT + "/";
@@ -369,7 +369,7 @@ public class Main {
failoverServer = new StandbyServer(
options.has(port)? options.valueOf(port) : defaultPort,
store,
- admissibleSlaves.toArray(new String[0]),
+ admissibleSlaves.toArray(new String[admissibleSlaves.size()]),
options.has(secure) && options.valueOf(secure));
failoverServer.startAndWait();
} finally {
@@ -922,7 +922,7 @@ public class Main {
*/
private static boolean isValidFileStore(String path) {
File store = new File(path);
- if (store == null || !store.isDirectory()) {
+ if (!store.isDirectory()) {
return false;
}
// for now the only check is the existence of the journal file