Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 24053 invoked from network); 26 Apr 2005 14:23:53 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 26 Apr 2005 14:23:53 -0000 Received: (qmail 50768 invoked by uid 500); 26 Apr 2005 14:24:33 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 50706 invoked by uid 500); 26 Apr 2005 14:24:32 -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: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 50691 invoked by uid 99); 26 Apr 2005 14:24:32 -0000 X-ASF-Spam-Status: No, hits=0.2 required=10.0 tests=NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Tue, 26 Apr 2005 07:24:32 -0700 Received: (qmail 24017 invoked by uid 65534); 26 Apr 2005 14:23:50 -0000 Message-ID: <20050426142350.24016.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: svn commit: r164795 - /cocoon/trunk/src/java/org/apache/cocoon/util/log/CocoonLogFormatter.java Date: Tue, 26 Apr 2005 14:23:49 -0000 To: cvs@cocoon.apache.org From: lgawron@apache.org X-Mailer: svnmailer-1.0.0-dev X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: lgawron Date: Tue Apr 26 07:23:49 2005 New Revision: 164795 URL: http://svn.apache.org/viewcvs?rev=3D164795&view=3Drev Log: queryString may be null Modified: cocoon/trunk/src/java/org/apache/cocoon/util/log/CocoonLogFormatter.java Modified: cocoon/trunk/src/java/org/apache/cocoon/util/log/CocoonLogFormatt= er.java URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/= util/log/CocoonLogFormatter.java?rev=3D164795&r1=3D164794&r2=3D164795&view= =3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- cocoon/trunk/src/java/org/apache/cocoon/util/log/CocoonLogFormatter.jav= a (original) +++ cocoon/trunk/src/java/org/apache/cocoon/util/log/CocoonLogFormatter.jav= a Tue Apr 26 07:23:49 2005 @@ -230,9 +230,13 @@ final Object context =3D ctxMap.get("objectModel"); if (context !=3D null && context instanceof Map) { // Get the request - final Request request =3D ObjectModelHelper.getRequest((Ma= p) context); + final Request request =3D ObjectModelHelper + .getRequest((Map) context); if (request !=3D null) { - return "?" + request.getQueryString(); + String queryString =3D request.getQueryString(); + return (queryString !=3D null)=20 + ? ("?" + request.getQueryString())=20 + : ""; } } }