[exo-jcr-commits] exo-jcr SVN: r918 - jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/lock.

[do-not-reply at jboss.org]

Author: nzamosenchuk
Date: 2009-12-03 08:00:56 -0500 (Thu, 03 Dec 2009)
New Revision: 918

Modified:
   jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/SessionLockManager.java
Log:
EXOJCR-243: NodeData.getParentIdentifier may return null for root node. Added check for it

Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/SessionLockManager.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/SessionLockManager.java	2009-12-03 10:32:51 UTC (rev 917)
+++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/SessionLockManager.java	2009-12-03 13:00:56 UTC (rev 918)
@@ -396,15 +396,18 @@
          }
          if (retval == null && (searchType & SEARCH_PARENT) != 0)
          {
-
-            NodeData parentData = (NodeData)sessionDataManager.getItemData(data.getParentIdentifier());
-            if (parentData != null)
+            String parentIdentifier = data.getParentIdentifier();
+            if (parentIdentifier != null)
             {
-               retval = sessionDataManager.getLockData(parentData.getIdentifier());
-               // parent not found try to find upper
-               if (retval == null)
+               NodeData parentData = (NodeData)sessionDataManager.getItemData(parentIdentifier);
+               if (parentData != null)
                {
-                  retval = getLockData(parentData, SEARCH_PARENT);
+                  retval = sessionDataManager.getLockData(parentData.getIdentifier());
+                  // parent not found try to find upper
+                  if (retval == null)
+                  {
+                     retval = getLockData(parentData, SEARCH_PARENT);
+                  }
                }
             }
          }