mturk 2002/06/30 02:59:11
Modified: jk/java/org/apache/jk/apr TomcatStarter.java
Log:
Removed the jkStatus native call.
Use the jkSetAttribute for TC startup signaling.
Revision Changes Path
1.10 +3 -4
jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/TomcatStarter.java
Index: TomcatStarter.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/TomcatStarter.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TomcatStarter.java 29 Jun 2002 07:43:38 -0000 1.9
+++ TomcatStarter.java 30 Jun 2002 09:59:11 -0000 1.10
@@ -15,13 +15,12 @@
public class TomcatStarter implements Runnable {
Class c;
String args[];
+ AprImpl apr = new AprImpl();
public static String mainClasses[]={ "org.apache.tomcat.startup.Main",
"org.apache.catalina.startup.BootstrapService",
"org.apache.catalina.startup.Bootstrap"};
- public static final int TC_STARTING=1;
- public static final int TC_STARTED=2;
// If someone has time - we can also guess the classpath and do other
// fancy guessings.
@@ -71,12 +70,12 @@
public void run() {
System.err.println("Starting " + c.getName());
try {
- AprImpl.jniStatus(TC_STARTING);
Class argClass=args.getClass();
Method m=c.getMethod( "main", new Class[] {argClass} );
m.invoke( c, new Object[] { args } );
- AprImpl.jniStatus(TC_STARTED);
System.out.println("TomcatStarter: Done");
+ if (apr.isLoaded())
+ apr.jkSetAttribute(0, 0, "channel:jni", "done");
} catch( Throwable t ) {
t.printStackTrace(System.err);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
