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 2005/09/21 11:43:31 UTC
svn commit: r290668 - in
/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet:
CopletData.java CopletInstanceData.java
adapter/impl/CachingURICopletAdapter.java
Author: cziegeler
Date: Wed Sep 21 02:43:26 2005
New Revision: 290668
URL: http://svn.apache.org/viewcvs?rev=290668&view=rev
Log:
Fixing bug in CachingURICopletAdapter report by Jean-Baptiste Quenot <jb...@anyware-tech.com> (fixes bug #36728).
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/CopletData.java
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/CopletInstanceData.java
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/CopletData.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/CopletData.java?rev=290668&r1=290667&r2=290668&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/CopletData.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/CopletData.java Wed Sep 21 02:43:26 2005
@@ -92,8 +92,8 @@
this.copletBaseData = copletBaseData;
}
- public void removeAttribute(String key) {
- this.attributes.remove(key);
+ public Object removeAttribute(String key) {
+ return this.attributes.remove(key);
}
public Object getAttribute(String key) {
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/CopletInstanceData.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/CopletInstanceData.java?rev=290668&r1=290667&r2=290668&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/CopletInstanceData.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/CopletInstanceData.java Wed Sep 21 02:43:26 2005
@@ -81,8 +81,8 @@
this.attributes.put(key, value);
}
- public void removeAttribute(String key) {
- this.attributes.remove(key);
+ public Object removeAttribute(String key) {
+ return this.attributes.remove(key);
}
public Map getAttributes() {
@@ -115,8 +115,8 @@
this.temporaryAttributes.put(key, value);
}
- public void removeTemporaryAttribute(String key) {
- this.temporaryAttributes.remove(key);
+ public Object removeTemporaryAttribute(String key) {
+ return this.temporaryAttributes.remove(key);
}
public Map getTemporaryAttributes() {
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=290668&r1=290667&r2=290668&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 Wed Sep 21 02:43:26 2005
@@ -164,17 +164,19 @@
super.streamContent(coplet, uri, bc);
data = bc.getSAXFragment();
- if ( cacheGlobal ) {
- CachedResponse response = new CachedResponse((SourceValidity[])null, (byte[])data);
- try {
- final String key = this.getCacheKey(coplet, uri);
- this.cache.store(key, response);
- } catch (ProcessingException pe) {
- // we ignore this
- this.getLogger().warn("Exception during storing response into cache.", pe);
+ if (coplet.removeTemporaryAttribute(DO_NOT_CACHE) == null) {
+ if ( cacheGlobal ) {
+ CachedResponse response = new CachedResponse((SourceValidity[])null, (byte[])data);
+ try {
+ final String key = this.getCacheKey(coplet, uri);
+ this.cache.store(key, response);
+ } catch (ProcessingException pe) {
+ // we ignore this
+ this.getLogger().warn("Exception during storing response into cache.", pe);
+ }
+ } else {
+ coplet.setTemporaryAttribute(CACHE, data);
}
- } else {
- coplet.setTemporaryAttribute(CACHE, data);
}
}
}