Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 39962 invoked from network); 22 Nov 2007 15:49:25 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 22 Nov 2007 15:49:25 -0000 Received: (qmail 57662 invoked by uid 500); 22 Nov 2007 15:49:12 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 57600 invoked by uid 500); 22 Nov 2007 15:49:12 -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 57585 invoked by uid 99); 22 Nov 2007 15:49:12 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Nov 2007 07:49:12 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Nov 2007 15:49:22 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D24721A9832; Thu, 22 Nov 2007 07:49:01 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r597440 - /cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/src/main/java/org/apache/cocoon/configuration/PropertyHelper.java Date: Thu, 22 Nov 2007 15:49:01 -0000 To: cvs@cocoon.apache.org From: giacomo@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071122154901.D24721A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: giacomo Date: Thu Nov 22 07:49:00 2007 New Revision: 597440 URL: http://svn.apache.org/viewvc?rev=597440&view=rev Log: fixing NPE Modified: cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/src/main/java/org/apache/cocoon/configuration/PropertyHelper.java Modified: cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/src/main/java/org/apache/cocoon/configuration/PropertyHelper.java URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/src/main/java/org/apache/cocoon/configuration/PropertyHelper.java?rev=597440&r1=597439&r2=597440&view=diff ============================================================================== --- cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/src/main/java/org/apache/cocoon/configuration/PropertyHelper.java (original) +++ cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/src/main/java/org/apache/cocoon/configuration/PropertyHelper.java Thu Nov 22 07:49:00 2007 @@ -159,8 +159,10 @@ String value = props.getProperty(key); // replace value = replace(value, props, settings); - // and put back - props.put(key, value); + // and put back but prevent NPE because of null value ?!?!? + // TODO: How to handle value==null situations? + if (value != null) + props.put(key, value); } } }