Return-Path: <costin@apache.org>
Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm
Delivered-To: mailing list tomcat-dev@jakarta.apache.org
Received: (qmail 94448 invoked by uid 500); 1 Feb 2001 06:41:17 -0000
Delivered-To: apmail-jakarta-tomcat-cvs@apache.org
Received: (qmail 94445 invoked by uid 1052); 1 Feb 2001 06:41:16 -0000
Date: 1 Feb 2001 06:41:16 -0000
Message-ID: <20010201064116.94444.qmail@apache.org>
From: costin@apache.org
To: jakarta-tomcat-cvs@apache.org
Subject: cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/config
 LogSetter.java

costin      01/01/31 22:41:16

  Modified:    src/share/org/apache/tomcat/modules/config LogSetter.java
  Log:
  NPE - path can be null ( for console output ).
  
  Note that per/context interceptors are not working right now, I'll
  have them restored tommorow night. I also have to commit the fix
  to the original problem ( war expansion broken ).
  
  Revision  Changes    Path
  1.3       +2 -1      jakarta-tomcat/src/share/org/apache/tomcat/modules/config/LogSetter.java
  
  Index: LogSetter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/LogSetter.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LogSetter.java	2001/02/01 06:08:48	1.2
  +++ LogSetter.java	2001/02/01 06:41:16	1.3
  @@ -164,7 +164,7 @@
       {
   	if( module!=this ) return;
   
  -	if( ! FileUtil.isAbsolute( path ) ) {
  +	if( path!=null && ! FileUtil.isAbsolute( path ) ) {
   	    File wd= new File(cm.getHome(), path);
   	    path= wd.getAbsolutePath();
   	}
  @@ -181,6 +181,7 @@
   
   	ql.open();
   
  +	//	if( debug>-1) log("Adding logger " + name + " " + servletLogger + " " + ctx );
   	cm.addLogger( ql );
   
   	if( ctx!=null ) {