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 32367 invoked by uid 500); 6 Feb 2001 06:41:08 -0000
Delivered-To: apmail-jakarta-tomcat-cvs@apache.org
Received: (qmail 32363 invoked by uid 1052); 6 Feb 2001 06:41:08 -0000
Date: 6 Feb 2001 06:41:08 -0000
Message-ID: <20010206064108.32362.qmail@apache.org>
From: costin@apache.org
To: jakarta-tomcat-cvs@apache.org
Subject: cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core
 Context.java ContextManager.java

costin      01/02/05 22:41:08

  Modified:    src/share/org/apache/tomcat/core Context.java
                        ContextManager.java
  Log:
  Estetic change in the way Contexts are displayed: use host:/path
  instead of Ctx ( .... )
  
  Revision  Changes    Path
  1.138     +2 -2      jakarta-tomcat/src/share/org/apache/tomcat/core/Context.java
  
  Index: Context.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Context.java,v
  retrieving revision 1.137
  retrieving revision 1.138
  diff -u -r1.137 -r1.138
  --- Context.java	2001/02/03 07:34:41	1.137
  +++ Context.java	2001/02/06 06:41:07	1.138
  @@ -1033,8 +1033,8 @@
       }
   
       public final  String toString() {
  -	return "Ctx( " +  (vhost==null ? "" :
  -					    vhost + ":" )  +  path +  ")";
  +	return (vhost==null ? "DEFAULT:" : vhost + ":" )  +
  +	       ("".equals(path)  ? "/ROOT" :  path);
       }
   
       // ------------------- Logging ---------------
  
  
  
  1.166     +1 -2      jakarta-tomcat/src/share/org/apache/tomcat/core/ContextManager.java
  
  Index: ContextManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ContextManager.java,v
  retrieving revision 1.165
  retrieving revision 1.166
  diff -u -r1.165 -r1.166
  --- ContextManager.java	2001/02/03 05:43:18	1.165
  +++ ContextManager.java	2001/02/06 06:41:07	1.166
  @@ -512,7 +512,7 @@
   		    existingI[i].addContext( this, ctx );
   		}
   		ctx.setState( Context.STATE_ADDED );
  -		log("Adding context " +  ctx.toString());
  +		log("Adding  " +  ctx.toString());
   	    } catch( TomcatException ex ) {
   		log( "Error adding context " + ctx , ex );
   		continue; 
  @@ -927,7 +927,6 @@
   	BaseInterceptor ri[];
   	int status;
   	ri=req.getContainer().getInterceptors( Container.H_handleError );
  -	
   	for( int i=0; i< ri.length; i++ ) {
   	    status=ri[i].handleError( req, res, t );
   	    if( status!=0 ) return;