jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1243559 - in /jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/state: ChangeTree.java NodeState.java
Date Mon, 13 Feb 2012 15:25:35 GMT
Author: mduerig
Date: Mon Feb 13 15:25:34 2012
New Revision: 1243559

URL: http://svn.apache.org/viewvc?rev=1243559&view=rev
Log:
Microkernel based prototype of JCR implementation (WIP)
- fix Node.remove() 

Modified:
    jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/state/ChangeTree.java
    jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/state/NodeState.java

Modified: jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/state/ChangeTree.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/state/ChangeTree.java?rev=1243559&r1=1243558&r2=1243559&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/state/ChangeTree.java
(original)
+++ jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/state/ChangeTree.java
Mon Feb 13 15:25:34 2012
@@ -153,6 +153,13 @@ public class ChangeTree {
         }
 
         /**
+         * @return the parent of this node
+         */
+        public NodeDelta getParent() {
+            return parent;
+        }
+
+        /**
          * @return transient path to this node
          */
         public Path getPath() {

Modified: jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/state/NodeState.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/state/NodeState.java?rev=1243559&r1=1243558&r2=1243559&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/state/NodeState.java
(original)
+++ jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/state/NodeState.java
Mon Feb 13 15:25:34 2012
@@ -77,8 +77,7 @@ public class NodeState {
     }
 
     public void remove() throws ItemNotFoundException {
-        nodeDelta.remove();  // fixme: don't use internal API
-        nodeStateCache().remove(getPath());
+        nodeDelta.getParent().removeNode(getName());
     }
 
     public void move(String name, Path destination) throws ItemExistsException, PathNotFoundException,



Mime
View raw message