svn commit: r1673390 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak: core/SecureNodeBuilder.java core/SecureNodeState.java spi/whiteboard/WhiteboardExecutor.java

[an...@apache.org]

Author: angela
Date: Tue Apr 14 08:49:19 2015
New Revision: 1673390

URL: http://svn.apache.org/r1673390
Log:
OAK-2674 :  Fix FindBug Issues (@Nonnull/@Nullable issues)

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeBuilder.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeState.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardExecutor.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeBuilder.java?rev=1673390&r1=1673389&r2=1673390&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeBuilder.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeBuilder.java Tue Apr 14 08:49:19 2015
@@ -370,9 +370,12 @@ class SecureNodeBuilder implements NodeB
      */
     private class ReadablePropertyPredicate implements Predicate<PropertyState> {
         @Override
-        public boolean apply(@Nonnull PropertyState property) {
-            return getTreePermission().canRead(property)
-                    || isNew(property.getName());
+        public boolean apply(@Nullable PropertyState property) {
+            if (property != null) {
+                return getTreePermission().canRead(property) || isNew(property.getName());
+            } else {
+                return false;
+            }
         }
     }
 

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeState.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeState.java?rev=1673390&r1=1673389&r2=1673390&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeState.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeState.java Tue Apr 14 08:49:19 2015
@@ -18,6 +18,7 @@ package org.apache.jackrabbit.oak.core;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import com.google.common.base.Function;
 import com.google.common.base.Predicate;
@@ -164,8 +165,8 @@ class SecureNodeState extends AbstractNo
      */
     private class ReadablePropertyPredicate implements Predicate<PropertyState> {
         @Override
-        public boolean apply(@Nonnull PropertyState property) {
-            return treePermission.canRead(property);
+        public boolean apply(@Nullable PropertyState property) {
+            return property != null && treePermission.canRead(property);
         }
     }
 
@@ -174,8 +175,8 @@ class SecureNodeState extends AbstractNo
      */
     private static class IterableNodePredicate implements Predicate<ChildNodeEntry> {
         @Override
-        public boolean apply(@Nonnull ChildNodeEntry input) {
-            return input.getNodeState().exists();
+        public boolean apply(@Nullable ChildNodeEntry input) {
+            return input != null && input.getNodeState().exists();
         }
     }
 

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardExecutor.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardExecutor.java?rev=1673390&r1=1673389&r2=1673390&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardExecutor.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardExecutor.java Tue Apr 14 08:49:19 2015
@@ -19,6 +19,7 @@
 package org.apache.jackrabbit.oak.spi.whiteboard;
 
 import java.util.concurrent.Executor;
+import javax.annotation.Nonnull;
 
 /**
  * Dynamic {@link Executor} based on the available whiteboard services.
@@ -36,7 +37,7 @@ public class WhiteboardExecutor extends
     //----------------------------------------------------------< Executor >--
 
     @Override
-    public void execute(Runnable command) {
+    public void execute(@Nonnull Runnable command) {
         for (Executor executor : getServices()) {
             // use the first executor to run the command
             executor.execute(command);