svn commit: r1771895 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/ClusterRepositoryInfo.java

[tomekr]

Author: tomekr
Date: Tue Nov 29 12:19:13 2016
New Revision: 1771895

URL: http://svn.apache.org/viewvc?rev=1771895&view=rev
Log:
OAK-5183: ClusterRepositoryInfo.getOrCreateId should explicitly check for a 
null argument

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/ClusterRepositoryInfo.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/ClusterRepositoryInfo.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/ClusterRepositoryInfo.java?rev=1771895&r1=1771894&r2=1771895&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/ClusterRepositoryInfo.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/ClusterRepositoryInfo.java
 Tue Nov 29 12:19:13 2016
@@ -16,9 +16,12 @@
  */
 package org.apache.jackrabbit.oak.plugins.identifier;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import java.util.UUID;
 
 import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
 
 import org.apache.jackrabbit.oak.api.CommitFailedException;
 import org.apache.jackrabbit.oak.api.Type;
@@ -55,7 +58,9 @@ public class ClusterRepositoryInfo {
      * @return the persistent clusterId
      */
     @CheckForNull
-    public static String getOrCreateId(NodeStore store) {
+    public static String getOrCreateId(@Nonnull NodeStore store) {
+        checkNotNull(store, "store is null");
+
         // first try to read an existing clusterId
         NodeState root = store.getRoot();
         NodeState node = root.getChildNode(CLUSTER_CONFIG_NODE);