svn commit: r1673396 - /jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java

[angela]

Author: angela
Date: Tue Apr 14 09:34:00 2015
New Revision: 1673396

URL: http://svn.apache.org/r1673396
Log:
OAK-2712 : Possible null-dereference when calling ItemImpl#perform

Modified:
    
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java

Modified: 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java?rev=1673396&r1=1673395&r2=1673396&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java
 Tue Apr 14 09:34:00 2015
@@ -1063,10 +1063,9 @@ public class NodeImpl<T extends NodeDele
 
     @Override
     public void update(final String srcWorkspace) throws RepositoryException {
-        perform(new ItemWriteOperation<Void>("update") {
-            @Nonnull
+        sessionDelegate.performVoid(new ItemWriteOperation("update") {
             @Override
-            public Void perform() throws RepositoryException {
+            public void performVoid() throws RepositoryException {
                 checkValidWorkspace(srcWorkspace);
 
                 // check for pending changes
@@ -1079,7 +1078,6 @@ public class NodeImpl<T extends NodeDele
                 if (!srcWorkspace.equals(sessionDelegate.getWorkspaceName())) {
                     throw new 
UnsupportedRepositoryOperationException("OAK-118: Node.update");
                 }
-                return null;
             }
         });
     }