costin      2002/06/10 14:26:25

  Modified:    jk/java/org/apache/jk/apr AprImpl.java
  Log:
  Patch from Mladen Turk, to use RegisterNative.
  
  I changed it to make 'inprocess' the default ( better than null ).
  
  Revision  Changes    Path
  1.20      +5 -2      jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/AprImpl.java
  
  Index: AprImpl.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/AprImpl.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- AprImpl.java      1 Jun 2002 08:29:34 -0000       1.19
  +++ AprImpl.java      10 Jun 2002 21:26:25 -0000      1.20
  @@ -22,7 +22,7 @@
       Hashtable jkHandlers=new Hashtable();
   
       // Name of the so used in inprocess mode 
  -    String jniModeSo;
  +    String jniModeSo="inprocess";
       // name of the so used by java. If not set we'll loadLibrary("jkjni" ),
       // if set we load( nativeSo )
       String nativeSo;
  @@ -58,7 +58,6 @@
       /** Name of the so used in inprocess mode
        */
       public void setJniModeSo(String jniModeSo ) {
  -        System.out.println("XXX native so " + jniModeSo);
           this.jniModeSo=jniModeSo;
       }
   
  @@ -204,6 +203,10 @@
                  This seems the cleanest solution that works with multiple
                  VMs.
               */
  +            if (jniModeSo.equals("inprocess")) {
  +                ok=true;
  +                return;                                
  +            }
               try {
                   System.out.println("Loading " + jniModeSo);
                   if( jniModeSo!= null ) System.load( jniModeSo );
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to