Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 87795 invoked from network); 21 Sep 2005 09:56:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 21 Sep 2005 09:56:59 -0000 Received: (qmail 38923 invoked by uid 500); 21 Sep 2005 09:56:59 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 38873 invoked by uid 500); 21 Sep 2005 09:56:59 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 38859 invoked by uid 99); 21 Sep 2005 09:56:58 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 21 Sep 2005 02:56:58 -0700 Received: (qmail 87767 invoked by uid 65534); 21 Sep 2005 09:56:38 -0000 Message-ID: <20050921095638.87759.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r290670 - in /cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet: CopletData.java CopletInstanceData.java adapter/impl/CachingURICopletAdapter.java Date: Wed, 21 Sep 2005 09:56:32 -0000 To: cvs@cocoon.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: cziegeler Date: Wed Sep 21 02:56:28 2005 New Revision: 290670 URL: http://svn.apache.org/viewcvs?rev=290670&view=rev Log: Fixing bug in CachingURICopletAdapter report by Jean-Baptiste Quenot (fixes bug #36728). Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/CopletData.java cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/CopletInstanceData.java cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/adapter/impl/CachingURICopletAdapter.java Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/CopletData.java URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/CopletData.java?rev=290670&r1=290669&r2=290670&view=diff ============================================================================== --- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/CopletData.java (original) +++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/CopletData.java Wed Sep 21 02:56:28 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/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/CopletInstanceData.java URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/CopletInstanceData.java?rev=290670&r1=290669&r2=290670&view=diff ============================================================================== --- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/CopletInstanceData.java (original) +++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/CopletInstanceData.java Wed Sep 21 02:56:28 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/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/adapter/impl/CachingURICopletAdapter.java URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/adapter/impl/CachingURICopletAdapter.java?rev=290670&r1=290669&r2=290670&view=diff ============================================================================== --- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/adapter/impl/CachingURICopletAdapter.java (original) +++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/adapter/impl/CachingURICopletAdapter.java Wed Sep 21 02:56:28 2005 @@ -135,17 +135,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); } } }