You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@cocoon.apache.org by cz...@apache.org on 2006/04/02 19:07:12 UTC

svn commit: r390859 - /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/BeanFactoryUtil.java

Author: cziegeler
Date: Sun Apr  2 10:07:10 2006
New Revision: 390859

URL: http://svn.apache.org/viewcvs?rev=390859&view=rev
Log:
Fix NPE

Modified:
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/BeanFactoryUtil.java

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/BeanFactoryUtil.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/BeanFactoryUtil.java?rev=390859&r1=390858&r2=390859&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/BeanFactoryUtil.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/BeanFactoryUtil.java Sun Apr  2 10:07:10 2006
@@ -183,7 +183,7 @@
 
         // Configure the log4j manager
         String loggerConfig = settings.getLoggingConfiguration();
-        if ( !loggerConfig.startsWith("/") ) {
+        if ( loggerConfig != null && !loggerConfig.startsWith("/") ) {
             loggerConfig = '/' + loggerConfig;
         }
         if ( loggerConfig != null ) {