remm 2004/02/25 14:05:43
Modified: catalina/src/share/org/apache/catalina/startup
Bootstrap.java Catalina.java
Log:
- Fix bug 27127: Shutdown doesn't work with custom server port and non-default
config file.
Revision Changes Path
1.15 +26 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java
Index: Bootstrap.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Bootstrap.java 19 Nov 2003 18:18:51 -0000 1.14
+++ Bootstrap.java 25 Feb 2004 22:05:43 -0000 1.15
@@ -324,6 +324,30 @@
}
+ /**
+ * Stop the standlone server.
+ */
+ public void stopServer(String[] arguments)
+ throws Exception {
+
+ Object param[];
+ Class paramTypes[];
+ if (arguments==null || arguments.length==0) {
+ paramTypes = null;
+ param = null;
+ } else {
+ paramTypes = new Class[1];
+ paramTypes[0] = arguments.getClass();
+ param = new Object[1];
+ param[0] = arguments;
+ }
+ Method method =
+ catalinaDaemon.getClass().getMethod("stopServer", paramTypes);
+ method.invoke(catalinaDaemon, param);
+
+ }
+
+
/**
* Set flag.
*/
@@ -397,7 +421,7 @@
daemon.load(args);
daemon.start();
} else if (command.equals("stop")) {
- daemon.stopServer();
+ daemon.stopServer(args);
}
} catch (Throwable t) {
t.printStackTrace();
1.26 +12 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Catalina.java
Index: Catalina.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Catalina.java 5 Feb 2004 05:27:31 -0000 1.25
+++ Catalina.java 25 Feb 2004 22:05:43 -0000 1.26
@@ -423,6 +423,14 @@
public void stopServer() {
+ stopServer(null);
+ }
+
+ public void stopServer(String[] arguments) {
+
+ if (arguments != null) {
+ arguments(arguments);
+ }
if( server == null ) {
// Create and execute our Digester
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
