jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r793018 - /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/FineGrainedISMLocking.java
Date Fri, 10 Jul 2009 16:25:18 GMT
Author: jukka
Date: Fri Jul 10 16:25:18 2009
New Revision: 793018

URL: http://svn.apache.org/viewvc?rev=793018&view=rev
Log:
#0000 - JCR-1232: Merge UUID to NodeId

Replace UUID references with NodeId alternatives in FineGrainedISMLocking.

Modified:
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/FineGrainedISMLocking.java

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/FineGrainedISMLocking.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/FineGrainedISMLocking.java?rev=793018&r1=793017&r2=793018&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/FineGrainedISMLocking.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/FineGrainedISMLocking.java
Fri Jul 10 16:25:18 2009
@@ -27,7 +27,6 @@
 import org.apache.jackrabbit.core.id.NodeId;
 import org.apache.jackrabbit.core.id.NodeReferencesId;
 import org.apache.jackrabbit.core.id.PropertyId;
-import org.apache.jackrabbit.uuid.UUID;
 
 import EDU.oswego.cs.dl.util.concurrent.Latch;
 import EDU.oswego.cs.dl.util.concurrent.ReadWriteLock;
@@ -385,13 +384,13 @@
         }
 
         private static int slotIndex(ItemId id) {
-            UUID uuid;
+            NodeId nodeId;
             if (id.denotesNode()) {
-                uuid = ((NodeId) id).getUUID();
+                nodeId = (NodeId) id;
             } else {
-                uuid = ((PropertyId) id).getParentId().getUUID();
+                nodeId = ((PropertyId) id).getParentId();
             }
-            return ((int) uuid.getLeastSignificantBits()) & 0xf;
+            return ((int) nodeId.getLeastSignificantBits()) & 0xf;
         }
     }
 }



Mime
View raw message