jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1177299 - in /jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi: hierarchy/ChildNodeEntries.java nodetype/BitsetENTCacheImpl.java
Date Thu, 29 Sep 2011 13:21:22 GMT
Author: mduerig
Date: Thu Sep 29 13:21:22 2011
New Revision: 1177299

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

Modified:
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildNodeEntries.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/BitsetENTCacheImpl.java

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildNodeEntries.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildNodeEntries.java?rev=1177299&r1=1177298&r2=1177299&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildNodeEntries.java
(original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildNodeEntries.java
Thu Sep 29 13:21:22 2011
@@ -788,31 +788,6 @@ final class ChildNodeEntries {
          * Returns a single {@code NodeEntry} or an unmodifiable
          * {@code List} of NodeEntry objects.
          *
-         * @param name
-         * @return a single {@code NodeEntry} or a {@code List} of
-         * NodeEntry objects.
-         */
-        private Object get0(Name name) {
-            LinkedEntries.LinkNode val = nameMap.get(name);
-            if (val != null) {
-                return val.getNodeEntry();
-            } else {
-                List<LinkedEntries.LinkNode> l = snsMap.get(name);
-                if (l != null) {
-                    List<NodeEntry> nodeEntries = new ArrayList<NodeEntry>(l.size());
-                    for (LinkedEntries.LinkNode ln : l) {
-                        nodeEntries.add(ln.getNodeEntry());
-                    }
-                    return nodeEntries;
-                }
-            }
-            return null;
-        }
-
-        /**
-         * Returns a single {@code NodeEntry} or an unmodifiable
-         * {@code List} of NodeEntry objects.
-         *
          *
          * @param name
          * @return a single {@code NodeEntry} or a {@code List} of

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/BitsetENTCacheImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/BitsetENTCacheImpl.java?rev=1177299&r1=1177298&r2=1177299&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/BitsetENTCacheImpl.java
(original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/BitsetENTCacheImpl.java
Thu Sep 29 13:21:22 2011
@@ -112,8 +112,7 @@ class BitsetENTCacheImpl implements Effe
     public void invalidate(Name name) {
         // remove all affected effective node types from aggregates cache
         // (copy keys first to prevent ConcurrentModificationException)
-        ArrayList<Key> keys = new ArrayList<Key>(aggregates.keySet());
-        for (Key k : keys) {
+        for (Key k : new ArrayList<Key>(aggregates.keySet())) {
             EffectiveNodeType ent = get(k);
             if (ent.includesNodeType(name)) {
                 remove(k);



Mime
View raw message