You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2006/01/23 11:54:05 UTC
svn commit: r371522 - in /cocoon/branches/BRANCH_2_1_X: src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl/CachingURICopletAdapter.java status.xml

Author: cziegeler
Date: Mon Jan 23 02:53:54 2006
New Revision: 371522

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

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

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=371522&r1=371521&r2=371522&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 Mon Jan 23 02:53:54 2006
@@ -214,7 +214,8 @@
     }
 
     /**
-     * This adapter listens for CopletInstanceEvents. Each event sets the cache invalid.
+     * This adapter listens for CopletInstanceEvents. Each event sets the cache invalid,
+     * except for global caching using attributes, as all attributes are part of the cache key.
      */
     public void handleCopletInstanceEvent(CopletInstanceEvent event) {
         final CopletInstanceData coplet = (CopletInstanceData) event.getTarget();
@@ -225,7 +226,8 @@
         if ( !ignoreSizing || !isSizingEvent(event)) {
             // 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);

Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/status.xml?rev=371522&r1=371521&r2=371522&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Mon Jan 23 02:53:54 2006
@@ -180,6 +180,9 @@
   <release version="@version@" date="@date@">
 -->
   <release version="2.1.9" date="TBD">
+    <action dev="CZ" type="fix" fixes-bug="COCOON-1698" due-to="Guillaume Deflache" due-to-email="guillaume@anyware-tech.com">
+      Portal block: Fix handling of caching-global-use-attributes bug in CachingCopletAdapter.
+    </action>
     <action dev="AG" type="update">
       Updated log4j to 1.2.13.
     </action>