You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by co...@apache.org on 2001/08/21 07:11:45 UTC

cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/config ServerXmlReader.java

costin      01/08/20 22:11:45

  Modified:    src/share/org/apache/tomcat/modules/config
                        ServerXmlReader.java
  Log:
  Check system properties as well when replacing ${XXX} in server.xml.
  
  Revision  Changes    Path
  1.17      +4 -1      jakarta-tomcat/src/share/org/apache/tomcat/modules/config/ServerXmlReader.java
  
  Index: ServerXmlReader.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/ServerXmlReader.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- ServerXmlReader.java	2001/07/29 00:43:28	1.16
  +++ ServerXmlReader.java	2001/08/21 05:11:45	1.17
  @@ -191,7 +191,10 @@
   		return cm.getHome();
   	    }
   	    // XXX add other "predefined" properties
  -	    return cm.getProperty( key );
  +	    String s=cm.getProperty( key );
  +	    if( s==null )
  +		s=System.getProperty(key);
  +	    return s;
   	}
       }