svn commit: r1336168 - /jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/PropertyDelegate.java

[reschke]

Author: reschke
Date: Wed May  9 13:05:24 2012
New Revision: 1336168

URL: http://svn.apache.org/viewvc?rev=1336168&view=rev
Log:
move code so it becomes safe on null parent

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

Modified: 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/PropertyDelegate.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/PropertyDelegate.java?rev=1336168&r1=1336167&r2=1336168&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/PropertyDelegate.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/PropertyDelegate.java
 Wed May  9 13:05:24 2012
@@ -235,11 +235,11 @@ public class PropertyDelegate extends It
 
     private synchronized void resolve() {
         parent = sessionDelegate.getTree(parent.getPath());
-        String path = PathUtils.concat(parent.getPath(), 
propertyState.getName());
 
         if (parent == null) {
             propertyState = null;
         } else {
+            String path = PathUtils.concat(parent.getPath(), 
propertyState.getName());
             propertyState = parent.getProperty(PathUtils.getName(path));
         }
     }