Return-Path: Delivered-To: apmail-xml-cocoon-cvs-archive@xml.apache.org Received: (qmail 61768 invoked by uid 500); 24 Feb 2003 14:20:34 -0000 Mailing-List: contact cocoon-cvs-help@xml.apache.org; run by ezmlm Precedence: bulk Reply-To: cocoon-dev@xml.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cocoon-cvs@xml.apache.org Received: (qmail 61744 invoked by uid 500); 24 Feb 2003 14:20:33 -0000 Delivered-To: apmail-xml-cocoon2-cvs@apache.org Received: (qmail 61740 invoked from network); 24 Feb 2003 14:20:33 -0000 Received: from icarus.apache.org (208.185.179.13) by daedalus.apache.org with SMTP; 24 Feb 2003 14:20:33 -0000 Received: (qmail 33763 invoked by uid 1260); 24 Feb 2003 14:20:33 -0000 Date: 24 Feb 2003 14:20:33 -0000 Message-ID: <20030224142033.33762.qmail@icarus.apache.org> From: cziegeler@apache.org To: xml-cocoon2-cvs@apache.org Subject: cvs commit: xml-cocoon2/src/java/org/apache/cocoon/components/pipeline/impl AbstractCachingProcessingPipeline.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N cziegeler 2003/02/24 06:20:33 Modified: src/java/org/apache/cocoon/components/pipeline/impl AbstractCachingProcessingPipeline.java Log: Fixing NPE reported by Stephan Revision Changes Path 1.26 +3 -2 xml-cocoon2/src/java/org/apache/cocoon/components/pipeline/impl/AbstractCachingProcessingPipeline.java Index: AbstractCachingProcessingPipeline.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/pipeline/impl/AbstractCachingProcessingPipeline.java,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- AbstractCachingProcessingPipeline.java 31 Jan 2003 22:51:30 -0000 1.25 +++ AbstractCachingProcessingPipeline.java 24 Feb 2003 14:20:33 -0000 1.26 @@ -559,7 +559,8 @@ final SourceValidity validity = this.getValidityForInternalPipeline(i); if (validity == null) { - if (i > 0 && i > this.fromCacheKey.size()) { + if (i > 0 + && (this.fromCacheKey == null || i > this.fromCacheKey.size())) { // shorten key for(int m=i; m < this.toCacheSourceValidities.length; m++) { this.toCacheKey.removeLastKey();