costin 02/04/22 12:03:34
Modified: jk/java/org/apache/jk/server JkCoyoteHandler.java
JkMain.java
Log:
Fix the shutdown for jk2.
Revision Changes Path
1.12 +1 -1
jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkCoyoteHandler.java
Index: JkCoyoteHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkCoyoteHandler.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- JkCoyoteHandler.java 17 Apr 2002 22:39:26 -0000 1.11
+++ JkCoyoteHandler.java 22 Apr 2002 19:03:34 -0000 1.12
@@ -155,7 +155,7 @@
}
public void destroy() {
- // jkMain.stop();
+ jkMain.stop();
}
// -------------------- OutputBuffer implementation --------------------
1.21 +18 -1
jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkMain.java
Index: JkMain.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkMain.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- JkMain.java 18 Apr 2002 19:13:02 -0000 1.20
+++ JkMain.java 22 Apr 2002 19:03:34 -0000 1.21
@@ -230,7 +230,24 @@
"shm",
"request",
"container",
- "channelSocket"};
+ "channelSocket",
+ "channelJni",
+ "channelUn"};
+
+ public void stop()
+ {
+ for( int i=0; i<wEnv.getHandlerCount(); i++ ) {
+ if( wEnv.getHandler(i) != null ) {
+ try {
+ wEnv.getHandler(i).destroy();
+ } catch( IOException ex) {
+ log.error("Error stoping " + wEnv.getHandler(i).getName(), ex);
+ }
+ }
+ }
+
+ started=false;
+ }
public void start() throws IOException
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
