FFM : fix loading JNI

Author: pquiring

native/common/register.cpp

@@ -17,8 +17,6 @@ void registerNatives(JNIEnv *env, jclass cls, JNINativeMethod *methods, jint cou
   }
 }
 
-extern "C" {
-
 JNIEXPORT jobject JNICALL Java_javaforce_jni_JFNative_allocate
   (JNIEnv *e, jclass c, jint size)
 {
@@ -44,8 +42,6 @@ JNIEXPORT void JNICALL Java_javaforce_jni_JFNative_unpin
   e->ReleasePrimitiveArrayCritical((jarray)array, (void*)ptr, commit ? 0 : JNI_ABORT);
 }
 
-}  //extern "C"
-
 static JNINativeMethod javaforce_jni_JFNative[] = {
   {"allocate", "(I)Ljava/nio/ByteBuffer;", (void *)&Java_javaforce_jni_JFNative_allocate},
   {"free", "(Ljava/nio/ByteBuffer;)V", (void *)&Java_javaforce_jni_JFNative_free},

native/linux/native.cpp

@@ -36,6 +36,7 @@
 #include "javaforce_jni_UIJNI.h"
 #include "javaforce_jni_PCapJNI.h"
 #include "javaforce_jni_CLJNI.h"
+#include "javaforce_jni_JFNative.h"
 
 #include "../common/string.h"
 #include "../common/array.h"

native/windows/native.cpp

@@ -24,6 +24,7 @@
 #include "javaforce_jni_PCapJNI.h"
 #include "javaforce_jni_CLJNI.h"
 #include "javaforce_jni_ComPortJNI.h"
+#include "javaforce_jni_JFNative.h"
 
 #include "../common/string.h"
 #include "../common/array.h"

src/javaforce/ffm/FFM.java

@@ -1,6 +1,11 @@
 package javaforce.ffm;
 
 /** FFM support class.
+ *
+ * For Tomcat edit conf/server.xml and add to the <server> section:
+ *   <Listener className="org.apache.catalina.core.JniLifecycleListener" libraryPath="c:/programdata/javaforce/jfnative64.dll" />
+ * for Linux:
+ *   <Listener className="org.apache.catalina.core.JniLifecycleListener" libraryPath="/usr/lib/jfnative64.so" />
  *
  * @author pquiring
  */
@@ -79,9 +84,6 @@ public static void disable() {
 
   /** Set wether to load the JF native library to find JNI methods.
    * Default = false
-   *
-   * For Tomcat edit conf/server.xml and add to the <server> section:
-   *   <Listener className="org.apache.catalina.core.JniLifecycleListener" libraryPath="c:\programdata\javaforce\jfnative64.dll" />
    */
   public static void setLoadLibrary(boolean state) {
     jni_load = state;

src/javaforce/tests/TestIPC.java

@@ -26,6 +26,7 @@ public static void main(String[] args) {
       System.out.println(" client options : [--threads=#] [--delay=#]");
       return;
     }
+    FFM.setLoadLibrary(true);  //load JNI manually
     switch (args[0]) {
       case "server": server(); break;
       case "client": client(args); break;