You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by la...@locus.apache.org on 2000/12/16 16:10:07 UTC
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/task StopTomcat.java
larryi 00/12/16 07:10:06
Modified: src/share/org/apache/tomcat/task StopTomcat.java
Log:
Fix so stopTomcat() works with command line config file.
Revision Changes Path
1.14 +3 -3 jakarta-tomcat/src/share/org/apache/tomcat/task/StopTomcat.java
Index: StopTomcat.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/task/StopTomcat.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- StopTomcat.java 2000/11/20 02:10:36 1.13
+++ StopTomcat.java 2000/12/16 15:10:05 1.14
@@ -145,13 +145,13 @@
ServerXmlHelper sxml=new ServerXmlHelper();
sxml.setConnectorHelper( xh );
+ String tchome=sxml.getTomcatInstall();
// load server.xml
File f = null;
if (configFile != null)
f=new File(configFile);
-
- String tchome=sxml.getTomcatInstall();
- f=new File(tchome, DEFAULT_CONFIG);
+ else
+ f=new File(tchome, DEFAULT_CONFIG);
cm.setInstallDir( tchome);
try {