cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r371523 - /cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/impl/CachingURICopletAdapter.java
Date Mon, 23 Jan 2006 11:02:42 GMT
Author: cziegeler
Date: Mon Jan 23 03:02:36 2006
New Revision: 371523

URL: http://svn.apache.org/viewcvs?rev=371523&view=rev
Log:
Fix handling of caching-global-use-attributes bug in CachingCopletAdapter.

Modified:
    cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/impl/CachingURICopletAdapter.java

Modified: cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/impl/CachingURICopletAdapter.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/impl/CachingURICopletAdapter.java?rev=371523&r1=371522&r2=371523&view=diff
==============================================================================
--- cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/impl/CachingURICopletAdapter.java
(original)
+++ cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/adapter/impl/CachingURICopletAdapter.java
Mon Jan 23 03:02:36 2006
@@ -209,7 +209,8 @@
             if ( cleanupCache ) {
                 // do we cache globally?
                 boolean cacheGlobal = ((Boolean)this.getConfiguration(coplet, CONFIGURATION_CACHE_GLOBAL,
Boolean.FALSE)).booleanValue();
-                if ( cacheGlobal ) {
+                boolean cacheGlobalUseAttributes = ((Boolean)this.getConfiguration(coplet,
CONFIGURATION_CACHE_GLOBAL_USE_ATTRIBUTES, Boolean.FALSE)).booleanValue();
+                if ( cacheGlobal && !cacheGlobalUseAttributes ) {
                     final String key = this.getCacheKey(coplet,
                                                         (String) coplet.getCopletData().getAttribute("uri"));
                     this.cache.remove(key);



Mime
View raw message