tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@locus.apache.org
Subject cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core ContextManager.java
Date Sun, 02 Apr 2000 00:07:43 GMT
costin      00/04/01 16:07:43

  Modified:    src/share/org/apache/tomcat/core ContextManager.java
  Log:
  Fixed ( my ) stupid mistake - this.name = ... instead of name=.
  Setting "home" in server.xml works.
  
  Revision  Changes    Path
  1.67      +4 -3      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.66
  retrieving revision 1.67
  diff -u -r1.66 -r1.67
  --- ContextManager.java	2000/03/31 21:56:49	1.66
  +++ ContextManager.java	2000/04/02 00:07:43	1.67
  @@ -185,7 +185,7 @@
        */
       public void init()  throws TomcatException {
   	String cp=System.getProperty( "java.class.path");
  -	log( "<l:tomcat install=\"" + tomcatHome + "\" home=\"" + home + "\" classPath=\""
+ cp + "\" />");
  +	log( "<l:tomcat install=\"" + getTomcatHome() + "\" home=\"" + home + "\" classPath=\""
+ cp + "\" />");
   	//	long time=System.currentTimeMillis();
   	ContextInterceptor cI[]=getContextInterceptors();
   	for( int i=0; i< cI.length; i++ ) {
  @@ -461,7 +461,8 @@
           try {
               return  f.getCanonicalPath();
           } catch (IOException ioe) {
  -             return name; // oh well, we tried...
  +	    ioe.printStackTrace();
  +	    return name; // oh well, we tried...
           }
       }
       
  @@ -474,7 +475,7 @@
        * not affect that.
        */
       public void setHome(String home) {
  -	home=getCanonicalPath( home ); 
  +	this.home=getCanonicalPath( home ); 
   	log( "Setting home to " + this.home );
       }
       
  
  
  

Mime
View raw message