You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2012/03/16 11:21:14 UTC
svn commit: r1301417 - in /jackrabbit/branches/2.4: ./
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/CachingEntryCollector.java
Author: reschke
Date: Fri Mar 16 10:21:13 2012
New Revision: 1301417
URL: http://svn.apache.org/viewvc?rev=1301417&view=rev
Log:
JCR-3259: augment logging information around CachingEntryCollector (backported to 2.4)
Modified:
jackrabbit/branches/2.4/ (props changed)
jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/CachingEntryCollector.java
Propchange: jackrabbit/branches/2.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 16 10:21:13 2012
@@ -1,3 +1,3 @@
/jackrabbit/branches/JCR-2272:1173165-1176545
/jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1221447,1221579,1221593,1221789,1221818,1225179,1225191,1225196,1225207,1225525,1225528,1226452,1226472,1226515,1226750,1226863,1227171,1227240,1227590,1227593,1227615,1228058,1228149,1228155,1228160,1230507,1230681,1230688,1231204,1232035,1232100,1232404,1232831,1232920,1232922,1233069,1233344,1233446,1233468,1233471,1234807,1235192,1235375,1235423,1236709,1236775,1236819-1236821,1240053,1245443,1291424,1297526,1298428
+/jackrabbit/trunk:1221447,1221579,1221593,1221789,1221818,1225179,1225191,1225196,1225207,1225525,1225528,1226452,1226472,1226515,1226750,1226863,1227171,1227240,1227590,1227593,1227615,1228058,1228149,1228155,1228160,1230507,1230681,1230688,1231204,1232035,1232100,1232404,1232831,1232920,1232922,1233069,1233344,1233446,1233468,1233471,1234807,1235192,1235375,1235423,1236709,1236775,1236819-1236821,1240053,1245443,1291424,1297526,1298428,1301397
Modified: jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/CachingEntryCollector.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/CachingEntryCollector.java?rev=1301417&r1=1301416&r2=1301417&view=diff
==============================================================================
--- jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/CachingEntryCollector.java (original)
+++ jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/CachingEntryCollector.java Fri Mar 16 10:21:13 2012
@@ -93,6 +93,8 @@ class CachingEntryCollector extends Entr
if (entries == null) {
// fetch entries and update the cache
entries = updateCache(node);
+ } else {
+ log.debug("Cache hit for nodeId {}", nodeId);
}
}
return entries;
@@ -110,6 +112,8 @@ class CachingEntryCollector extends Entr
// fetch entries and update the cache
NodeImpl n = getNodeById(nodeId);
entries = updateCache(n);
+ } else {
+ log.debug("Cache hit for nodeId {}", nodeId);
}
}
return entries;
@@ -190,6 +194,7 @@ class CachingEntryCollector extends Entr
if ((type & POLICY_ADDED) == POLICY_ADDED) {
// clear the complete cache since the nextAcNodeId may
// have changed due to the added acl.
+ log.debug("Policy added, clearing the cache");
cache.clear();
break; // no need for further processing.
} else if ((type & POLICY_REMOVED) == POLICY_REMOVED) {
@@ -209,6 +214,7 @@ class CachingEntryCollector extends Entr
cache.remove(nodeId);
} else if ((type & MOVE) == MOVE) {
// some sort of move operation that may affect the cache
+ log.debug("Move operation, clearing the cache");
cache.clear();
break; // no need for further processing.
}