cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r371878 - /cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl/CachingURICopletAdapter.java
Date Tue, 24 Jan 2006 10:12:41 GMT
Author: cziegeler
Date: Tue Jan 24 02:12:35 2006
New Revision: 371878

URL: http://svn.apache.org/viewcvs?rev=371878&view=rev
Log:
Fix bug

Modified:
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl/CachingURICopletAdapter.java

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl/CachingURICopletAdapter.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl/CachingURICopletAdapter.java?rev=371878&r1=371877&r2=371878&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl/CachingURICopletAdapter.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl/CachingURICopletAdapter.java
Tue Jan 24 02:12:35 2006
@@ -227,10 +227,12 @@
             // do we cache globally?
             boolean cacheGlobal = ((Boolean)this.getConfiguration(coplet, CONFIGURATION_CACHE_GLOBAL,
Boolean.FALSE)).booleanValue();
             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);
+            if ( cacheGlobal ) {
+                if ( !cacheGlobalUseAttributes ) {
+                    final String key = this.getCacheKey(coplet,
+                                                       (String) coplet.getCopletData().getAttribute("uri"));
+                    this.cache.remove(key);
+                }
             } else {
                 coplet.removeTemporaryAttribute(CACHE);
             }



Mime
View raw message