Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 47449 invoked from network); 31 Dec 2006 12:34:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 31 Dec 2006 12:34:13 -0000 Received: (qmail 91196 invoked by uid 500); 31 Dec 2006 12:34:20 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 91066 invoked by uid 500); 31 Dec 2006 12:34:20 -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 91054 invoked by uid 99); 31 Dec 2006 12:34:19 -0000 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME 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; Sun, 31 Dec 2006 04:34:18 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 7155F1A981A; Sun, 31 Dec 2006 04:03:45 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r491411 - /cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/src/main/java/org/apache/cocoon/spring/configurator/ResourceUtils.java Date: Sun, 31 Dec 2006 12:03:45 -0000 To: cvs@cocoon.apache.org From: danielf@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061231120345.7155F1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: danielf Date: Sun Dec 31 04:03:44 2006 New Revision: 491411 URL: http://svn.apache.org/viewvc?view=rev&rev=491411 Log: Avoid NPE in non Maven context (e.g. Eclipse). Modified: cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/src/main/java/org/apache/cocoon/spring/configurator/ResourceUtils.java Modified: cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/src/main/java/org/apache/cocoon/spring/configurator/ResourceUtils.java URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/src/main/java/org/apache/cocoon/spring/configurator/ResourceUtils.java?view=diff&rev=491411&r1=491410&r2=491411 ============================================================================== --- cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/src/main/java/org/apache/cocoon/spring/configurator/ResourceUtils.java (original) +++ cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/src/main/java/org/apache/cocoon/spring/configurator/ResourceUtils.java Sun Dec 31 04:03:44 2006 @@ -203,7 +203,10 @@ final String resourceName = "META-INF/maven/" + groupId + "/" + versionId + "/pom.properties"; try { final Properties p = new Properties(); - p.load(Thread.currentThread().getContextClassLoader().getResourceAsStream(resourceName)); + final InputStream resourceAsStream = Thread.currentThread().getContextClassLoader().getResourceAsStream(resourceName); + if (resourceAsStream == null) + return null; + p.load(resourceAsStream); return p; } catch (IOException ignore) { return null;