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:56:55 UTC
svn commit: r1301431 -
/jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/CachingEntryCollector.java
Author: reschke
Date: Fri Mar 16 10:56:54 2012
New Revision: 1301431
URL: http://svn.apache.org/viewvc?rev=1301431&view=rev
Log:
JCR-3259: augment logging information around CachingEntryCollector (backported to 2.2 and fixed)
Modified:
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/CachingEntryCollector.java
Modified: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/CachingEntryCollector.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/CachingEntryCollector.java?rev=1301431&r1=1301430&r2=1301431&view=diff
==============================================================================
--- jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/CachingEntryCollector.java (original)
+++ jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/CachingEntryCollector.java Fri Mar 16 10:56:54 2012
@@ -94,11 +94,10 @@ class CachingEntryCollector extends Entr
CacheEntry ce = cache.get(nodeId);
if (ce != null) {
entries = ce.entries;
+ log.debug("Cache hit for nodeId {}", nodeId);
} else {
// fetch entries and update the cache
entries = updateCache(node);
- } else {
- log.debug("Cache hit for nodeId {}", nodeId);
}
}
return entries;
@@ -114,12 +113,11 @@ class CachingEntryCollector extends Entr
CacheEntry ce = cache.get(nodeId);
if (ce != null) {
entries = ce.entries;
+ log.debug("Cache hit for nodeId {}", nodeId);
} else {
// fetch entries and update the cache
NodeImpl n = getNodeById(nodeId);
entries = updateCache(n);
- } else {
- log.debug("Cache hit for nodeId {}", nodeId);
}
}
return entries;