costin 2002/07/02 12:58:27
Modified: jk/java/org/apache/jk/common ChannelSocket.java
jk/java/org/apache/jk/server JkMain.java
Log:
Add support for the daemon setting.
Minor fix in JkMain
Revision Changes Path
1.17 +11 -0
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelSocket.java
Index: ChannelSocket.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelSocket.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ChannelSocket.java 2 Jul 2002 16:57:30 -0000 1.16
+++ ChannelSocket.java 2 Jul 2002 19:58:27 -0000 1.17
@@ -201,6 +201,17 @@
public int getInstanceId() {
return port-startPort;
}
+
+ /** If set to false, the thread pool will be created in
+ * non-daemon mode, and will prevent main from exiting
+ */
+ public void setDaemon( boolean b ) {
+ tp.setDaemon( b );
+ }
+
+ public void getDaemon() {
+ return tp.getDaemon();
+ }
/* ==================== ==================== */
ServerSocket sSocket;
1.27 +1 -0
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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- JkMain.java 5 Jun 2002 21:24:29 -0000 1.26
+++ JkMain.java 2 Jul 2002 19:58:27 -0000 1.27
@@ -208,6 +208,7 @@
// XXX use IntrospectionUtil to find myself
this.guessHome();
}
+ home=wEnv.getJkHome();
if( home != null ) {
File hF=new File(home);
File conf=new File( home, "conf" );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
