From cocoon-cvs-return-9407-apmail-xml-cocoon-cvs-archive=xml.apache.org@xml.apache.org Thu Dec 05 14:18:32 2002 Return-Path: Delivered-To: apmail-xml-cocoon-cvs-archive@xml.apache.org Received: (qmail 62620 invoked by uid 500); 5 Dec 2002 14:18:31 -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 62611 invoked by uid 500); 5 Dec 2002 14:18:31 -0000 Delivered-To: apmail-xml-cocoon2-cvs@apache.org Date: 5 Dec 2002 14:18:31 -0000 Message-ID: <20021205141831.54373.qmail@icarus.apache.org> From: cziegeler@apache.org To: xml-cocoon2-cvs@apache.org Subject: cvs commit: xml-cocoon2/src/java/org/apache/cocoon/environment/http HttpRequest.java HttpContext.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N cziegeler 2002/12/05 06:18:31 Modified: src/java/org/apache/cocoon/environment/http Tag: cocoon_2_0_3_branch HttpRequest.java HttpContext.java Log: Minor performance improvement and securing instance variables Revision Changes Path No revision No revision 1.6.2.6 +3 -1 xml-cocoon2/src/java/org/apache/cocoon/environment/http/HttpRequest.java Index: HttpRequest.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/http/HttpRequest.java,v retrieving revision 1.6.2.5 retrieving revision 1.6.2.6 diff -u -r1.6.2.5 -r1.6.2.6 --- HttpRequest.java 5 Dec 2002 14:07:56 -0000 1.6.2.5 +++ HttpRequest.java 5 Dec 2002 14:18:30 -0000 1.6.2.6 @@ -305,6 +305,7 @@ } private String decode(String str) { + if (str == null) return null; try { if (this.container_encoding == null) this.container_encoding = "ISO-8859-1"; @@ -321,6 +322,7 @@ public String[] getParameterValues(String name) { String[] values = this.req.getParameterValues(name); + if (values == null) return null; if (this.form_encoding == null) { return values; } 1.7.2.3 +2 -2 xml-cocoon2/src/java/org/apache/cocoon/environment/http/HttpContext.java Index: HttpContext.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/http/HttpContext.java,v retrieving revision 1.7.2.2 retrieving revision 1.7.2.3 diff -u -r1.7.2.2 -r1.7.2.3 --- HttpContext.java 5 Dec 2002 14:07:56 -0000 1.7.2.2 +++ HttpContext.java 5 Dec 2002 14:18:30 -0000 1.7.2.3 @@ -111,7 +111,7 @@ try { value = this.servletContext.getResource("/WEB-INF").toString(); } catch (MalformedURLException mue) { - throw new CascadingRuntimeException("Cannot determine the base URL", mue); + throw new CascadingRuntimeException("Cannot determine the base URL for " + path, mue); } value = value.substring(0,value.length()-"WEB-INF".length()); } ---------------------------------------------------------------------- In case of troubles, e-mail: webmaster@xml.apache.org To unsubscribe, e-mail: cocoon-cvs-unsubscribe@xml.apache.org For additional commands, e-mail: cocoon-cvs-help@xml.apache.org