Changeset 25244 for main/trunk/greenstone2/common-src/indexers/mg/jni/MGWrapperImpl.c

Timestamp:

2012-03-21T20:05:50+13:00 (12 years ago)

Author:

ak19

Message:

GS3 tomcat server crashes because java crashes owing to some error in the JNI code. The error may be related to pointers having been stored as int rather than long, an issue that's become noticeable on 64 bit linux machines. Changes have been made in the JNI code where these pointers that are transferred between Java and C++ code are stored (GetIntField and SetIntField to GetLongField and SetLongField, as well as declaration of data_ptr as jlong not jint). Committing code first without debug statements so the commits can easily be done separately.

File:

• main/trunk/greenstone2/common-src/indexers/mg/jni/MGWrapperImpl.c (modified) (10 diffs)

main/trunk/greenstone2/common-src/indexers/mg/jni/MGWrapperImpl.c

@@ -168 +168 @@
 
   /* Save the object on the Java side */
-  (*j_env)->SetIntField(j_env, j_obj, FID_mg_data, (mg_s_long) data);
+  (*j_env)->SetLongField(j_env, j_obj, FID_mg_data, (long) data);
 
   /* Initialise MG environment variables */
@@ -278 +278 @@
                          jlong j_docnum)
 {
-  MGWrapperData* data = (MGWrapperData*) (*j_env)->GetIntField(j_env, j_obj, FID_mg_data);
+  MGWrapperData* data = (MGWrapperData*) (*j_env)->GetLongField(j_env, j_obj, FID_mg_data);
 
   char* index_path;
@@ -363 +363 @@
                       jstring j_query)
 {
-  MGWrapperData* data = (MGWrapperData*) (*j_env)->GetIntField(j_env, j_obj, FID_mg_data);
+  MGWrapperData* data = (MGWrapperData*) (*j_env)->GetLongField(j_env, j_obj, FID_mg_data);
 
   char* index_path;
@@ -628 +628 @@
                      jboolean j_on)
 {
-  MGWrapperData* data = (MGWrapperData*) (*j_env)->GetIntField(j_env, j_obj, FID_mg_data);
+  MGWrapperData* data = (MGWrapperData*) (*j_env)->GetLongField(j_env, j_obj, FID_mg_data);
 
   if (j_on) {
@@ -643 +643 @@
                      jboolean j_on)
 {
-  MGWrapperData* data = (MGWrapperData*) (*j_env)->GetIntField(j_env, j_obj, FID_mg_data);
+  MGWrapperData* data = (MGWrapperData*) (*j_env)->GetLongField(j_env, j_obj, FID_mg_data);
 
   if (j_on) {
@@ -658 +658 @@
                         jint j_max)
 {
-  MGWrapperData* data = (MGWrapperData*) (*j_env)->GetIntField(j_env, j_obj, FID_mg_data);
+  MGWrapperData* data = (MGWrapperData*) (*j_env)->GetLongField(j_env, j_obj, FID_mg_data);
   data->queryInfo->maxDocs = j_max;
 }
@@ -681 +681 @@
                         jboolean j_on)
 {
-  MGWrapperData* data = (MGWrapperData*) (*j_env)->GetIntField(j_env, j_obj, FID_mg_data);
+  MGWrapperData* data = (MGWrapperData*) (*j_env)->GetLongField(j_env, j_obj, FID_mg_data);
   data->queryInfo->needTermFreqs = j_on;
 }
@@ -691 +691 @@
                       jstring j_index)
 {
-  MGWrapperData* data = (MGWrapperData*) (*j_env)->GetIntField(j_env, j_obj, FID_mg_data);
+  MGWrapperData* data = (MGWrapperData*) (*j_env)->GetLongField(j_env, j_obj, FID_mg_data);
 
   /* Get the index name as a C string */
@@ -717 +717 @@
                           jint j_mode)
 {
-  MGWrapperData* data = (MGWrapperData*) (*j_env)->GetIntField(j_env, j_obj, FID_mg_data);
+  MGWrapperData* data = (MGWrapperData*) (*j_env)->GetLongField(j_env, j_obj, FID_mg_data);
   data->defaultBoolCombine = j_mode;
 }
@@ -726 +726 @@
 Java_org_greenstone_mg_MGWrapper_getQueryParams(JNIEnv *j_env, jobject j_obj)
 {
-  MGWrapperData* data = (MGWrapperData*) (*j_env)->GetIntField(j_env, j_obj, FID_mg_data);
+  MGWrapperData* data = (MGWrapperData*) (*j_env)->GetLongField(j_env, j_obj, FID_mg_data);
   char result[512];  /* Assume this is big enough */