costin 02/04/25 15:44:24
Modified: jk/java/org/apache/jk/common JniHandler.java Shm.java
Log:
Few more fixes, checking if jni is initialized corectly and enabling the components
that depend on that.
Revision Changes Path
1.2 +1 -0
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/JniHandler.java
Index: JniHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/JniHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JniHandler.java 25 Apr 2002 18:20:32 -0000 1.1
+++ JniHandler.java 25 Apr 2002 22:44:23 -0000 1.2
@@ -115,6 +115,7 @@
apr=(AprImpl)wEnv.getHandler("apr");
if( apr==null || ! apr.isLoaded() ) {
log.error("No apr, disabling jni proxy ");
+ apr=null;
return;
}
1.6 +1 -1 jakarta-tomcat-connectors/jk/java/org/apache/jk/common/Shm.java
Index: Shm.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/Shm.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Shm.java 25 Apr 2002 22:04:00 -0000 1.5
+++ Shm.java 25 Apr 2002 22:44:23 -0000 1.6
@@ -176,7 +176,7 @@
public int invoke(Msg msg, MsgContext ep )
throws IOException
{
- if( apr==null ) return;
+ if( apr==null ) return 0;
System.err.println("ChannelShm.invoke: " + ep );
super.nativeDispatch( msg, ep, JK_HANDLE_SHM_DISPATCH );
return 0;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
