costin 02/04/18 10:57:53
Modified: jk/java/org/apache/jk/core WorkerEnv.java
jk/java/org/apache/jk/server JkMain.java
Log:
Move the start method from WorkerEnv to JkMain, eliminate all the unused
code from WorkerEnv.
WorkerEnv is just a store for the components and a 'note manager'.
Revision Changes Path
1.6 +3 -36
jakarta-tomcat-connectors/jk/java/org/apache/jk/core/WorkerEnv.java
Index: WorkerEnv.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/core/WorkerEnv.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WorkerEnv.java 20 Feb 2002 23:39:02 -0000 1.5
+++ WorkerEnv.java 18 Apr 2002 17:57:53 -0000 1.6
@@ -63,6 +63,7 @@
import java.security.*;
import org.apache.jk.common.*;
+import org.apache.jk.apr.*;
/**
* The controller object. It manages all other jk objects, acting as the root of
@@ -79,9 +80,6 @@
Hashtable properties;
- Object webapps[]=new Object[20];
- int webappCnt=0;
-
public static final int ENDPOINT_NOTE=0;
public static final int REQUEST_NOTE=1;
int noteId[]=new int[4];
@@ -102,16 +100,6 @@
}
}
- public int addWebapp( Object wa ) {
- if( webappCnt >= webapps.length ) {
- Object newWebapps[]=new Object[ webapps.length + 20 ];
- System.arraycopy( webapps, 0, newWebapps, 0, webapps.length);
- webapps=newWebapps;
- }
- webapps[webappCnt]=wa;
- return webappCnt++;
- }
-
public void setJkHome( String s ) {
home=s;
}
@@ -120,14 +108,6 @@
return home;
}
- public Object getWebapp( int i ) {
- return webapps[i];
- }
-
- public int getWebappCount() {
- return webappCnt;
- }
-
public final Object getNote(int i ) {
return notes[i];
}
@@ -168,21 +148,8 @@
return handlersTable[id];
}
- public void start() throws IOException {
- for( int i=0; i<handlerCount; i++ ) {
- //Enumeration en=handlersMap.keys();
- // while( en.hasMoreElements() ) {
- // String n=(String)en.nextElement();
- // JkHandler w=(JkHandler)handlersMap.get(n);
- if( handlersTable[i] != null )
- handlersTable[i].init();
- }
- }
-
- private static final int dL=0;
- private static void d(String s ) {
- System.err.println( "WorkerEnv: " + s );
+ public final int getHandlerCount() {
+ return handlerCount;
}
-
}
1.19 +15 -2
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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- JkMain.java 18 Apr 2002 17:48:00 -0000 1.18
+++ JkMain.java 18 Apr 2002 17:57:53 -0000 1.19
@@ -259,8 +259,21 @@
// Process properties - and add aditional handlers.
processProperties();
-
- wEnv.start();
+
+ for( int i=0; i<wEnv.getHandlerCount(); i++ ) {
+ if( wEnv.getHandler(i) != null ) {
+ try {
+ wEnv.getHandler(i).init();
+ } catch( IOException ex) {
+ if( "apr".equals(wEnv.getHandler(i).getName() )) {
+ log.error( "WorkerEnv: APR not initialized " +
ex.toString());
+ } else {
+ log.error( "WorkerEnv: error initializing " +
wEnv.getHandler(i).getName(), ex );
+ }
+ }
+ }
+ }
+
started=true;
long initTime=System.currentTimeMillis() - start_time;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
