You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by an...@apache.org on 2006/10/27 13:56:37 UTC

svn commit: r468354 - /jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/NodeState.java

Author: angela
Date: Fri Oct 27 04:56:36 2006
New Revision: 468354

URL: http://svn.apache.org/viewvc?view=rev&rev=468354
Log:
work in progress

- root node does not have a parent.

Modified:
    jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/NodeState.java

Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/NodeState.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/NodeState.java?view=diff&rev=468354&r1=468353&r2=468354
==============================================================================
--- jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/NodeState.java (original)
+++ jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/NodeState.java Fri Oct 27 04:56:36 2006
@@ -191,10 +191,10 @@
 
     private void assertAvailability() {
         // TODO: improve this.
-        if (uuid != null) {
+        if (uuid != null && parent != null) {
             // make sure this state is connected to its childNode-entry
             ChildNodeEntry cne = parent.childNodeEntries.get(uuid);
-            if (!cne.isAvailable()) {
+            if (cne != null && !cne.isAvailable()) {
                 try {
                     cne.getNodeState();
                 } catch (ItemStateException e) {