jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1185889 - in /jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy: HierarchyEntry.java NodeEntry.java
Date Tue, 18 Oct 2011 21:46:20 GMT
Author: mduerig
Date: Tue Oct 18 21:46:19 2011
New Revision: 1185889

URL: http://svn.apache.org/viewvc?rev=1185889&view=rev
Log:
Microkernel based Jackrabbit prototype (WIP)
simplification and clean up

Modified:
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyEntry.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntry.java

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyEntry.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyEntry.java?rev=1185889&r1=1185888&r2=1185889&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyEntry.java
(original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyEntry.java
Tue Oct 18 21:46:19 2011
@@ -173,7 +173,7 @@ public abstract class HierarchyEntry<STA
      * true also invalidates the underlying item states of all child entries.
      * @param recursive
      */
-    protected void invalidateInternal(boolean recursive) {
+    protected void invalidateItemState(boolean recursive) {
         STATE_TYPE state = getItemState();
         if (state != null) {
             state.invalidate();
@@ -551,7 +551,7 @@ public abstract class HierarchyEntry<STA
                 if (!invalidating) {
                     nextGeneration = 1;
                 }
-                entry.invalidateInternal(false);
+                entry.invalidateItemState(false);
             }
         }
 
@@ -572,7 +572,7 @@ public abstract class HierarchyEntry<STA
                 nextGeneration = 0;
                 try {
                     if (entry.generation == INVALIDATION_PENDING) {
-                        entry.invalidateInternal(true);
+                        entry.invalidateItemState(true);
                         entry.generation = currentGeneration;
                     } else if (entry.generation < currentGeneration) {
                         resolvePendingInvalidation(entry);
@@ -601,7 +601,7 @@ public abstract class HierarchyEntry<STA
 
                 // Then travel the path backwards invalidating as required
                 if (entry.generation == INVALIDATION_PENDING) {
-                    entry.invalidateInternal(true);
+                    entry.invalidateItemState(true);
                 }
                 entry.generation = currentGeneration;
             }

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntry.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntry.java?rev=1185889&r1=1185888&r2=1185889&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntry.java
(original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntry.java
Tue Oct 18 21:46:19 2011
@@ -1119,16 +1119,15 @@ public class NodeEntry extends Hierarchy
     }
 
     @Override
-    protected void invalidateInternal(boolean recursive) {
+    protected void invalidateItemState(boolean recursive) {
         if (recursive) {
             // invalidate all child entries including properties present in the
             // attic (removed props shadowed by a new property with the same name).
             for (Iterator<HierarchyEntry<?>> it = getAllChildEntries(true); it.hasNext();)
{
-                HierarchyEntry<?> ce = it.next();
-                ce.invalidate(true);
+                it.next().invalidate(true);
             }
         }
-        super.invalidateInternal(true);
+        super.invalidateItemState(true);
     }
 
     /**



Mime
View raw message