Return-Path: Delivered-To: apmail-xml-cocoon-dev-archive@xml.apache.org Received: (qmail 49886 invoked by uid 500); 9 Oct 2001 21:20:37 -0000 Mailing-List: contact cocoon-dev-help@xml.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: cocoon-dev@xml.apache.org Delivered-To: mailing list cocoon-dev@xml.apache.org Received: (qmail 49873 invoked from network); 9 Oct 2001 21:20:36 -0000 Message-Id: <200110092120.f99LKhA30119@orion.rgv.hp.com> X-Mailer: exmh 2.2 06/23/2000 with XEmacs 21.4.4 on Linux 2.2.19 From: Ovidiu Predescu To: cocoon-dev@xml.apache.org Subject: [C2.1] MRUMemoryStore patch X-Url: http://www.geocities.com/SiliconValley/Monitor/7464/ X-Image-Url: http://www.geocities.com/SiliconValley/Monitor/7464/ovidiu.tiff X-Face: ?(@Y~qjBA}~8ZMh5gM4{Q{bE_*:sCJ3@Z?{B*Co=J!#8bb~-z?-0._vJjt~MM59!MjxG%>U 5>MW^2-\7~z04buszR^=m^U|m66>FdR@cFwhb;.A(8*D.QmLkK]z,md0'HiOE\pyeiv_PACR+P:Cm. wq_%l':E:q]g-UCc>r&s@BVo'kFN;(\9PF22Myg5w%nUBWQ6MJJ#qL#w>2oxckP'H:\$9F"mxsz]Dg k{1`fTcP'Y$CgGnc^paTV$dzhVX+;(U$;Eb)P<>G)g) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Tue, 09 Oct 2001 14:20:43 -0700 Sender: ovidiu@orion.rgv.hp.com X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N The following patch handles the case when the key is null in the remove() method of MRUMemoryStore. Index: src/org/apache/cocoon/components/store/MRUMemoryStore.java =================================================================== RCS file: /Repository/Cocoon2/src/org/apache/cocoon/components/store/MRUMemoryStore.java,v retrieving revision 1.1.1.7 diff -u -I'\$Id:.*\$' -I'\$Author:.*\$' -I'\$Revision:.*\$' -r1.1.1.7 MRUMemoryStore.java --- MRUMemoryStore.java 2001/09/12 18:51:25 1.1.1.7 +++ MRUMemoryStore.java 2001/10/09 21:18:25 @@ -270,7 +270,7 @@ getLogger().debug("Removing object from store"); this.cache.remove(key); this.mrulist.remove(key); - if(this.filesystem) { + if(this.filesystem && key != null) { this.fsstore.remove(getFileName(key.toString())); } } Regards, -- Ovidiu Predescu http://orion.rgv.hp.com/ (inside HP's firewall only) http://sourceforge.net/users/ovidiu/ (my SourceForge page) http://www.geocities.com/SiliconValley/Monitor/7464/ (GNU, Emacs, other stuff) --------------------------------------------------------------------- To unsubscribe, e-mail: cocoon-dev-unsubscribe@xml.apache.org For additional commands, email: cocoon-dev-help@xml.apache.org