Changeset 57 for trunk/zoo-kernel/service_internal_java.c

Timestamp:

Jan 5, 2011, 3:20:01 PM (13 years ago)

Author:

djay

Message:

Adding contains and getIoTypeFromElement functions in service.h. Remove memory leaks from the Service Configuration Parser, add the support for multiple supported formats as before. Small modification of the ZOO-Kernel Java Support, adding the capability to access the modified main_conf HashMap? from the Kernel to let lenv message map pass when an error occurs and it is handled in the Service code. Adding same capability for the ZOO-Kernel Python Support. Use strcasecmp in service.h rather than strlen+strncasecmp. Ensure that only OWS compliant informations are available for Contact.Phone and Contact.Adress. Remove memory leak in createExceptionReportNode. Correction of the addDefaultValues function to add the default format using the informations from DataInputs? if present, this should correct the behavior of the ZOO-Kernel when choosing the extension value which should now point to the corresponding zcfg value if present. Don't set the NULL value for inputs not provided in the DataInputs?, still set NULL as default value for outputs. Avoid segfault in freeElements when some zcfg values was not set correctly. Link against the client libjvm.so file rather than the server one.

File:

• trunk/zoo-kernel/service_internal_java.c (modified) (10 diffs)

trunk/zoo-kernel/service_internal_java.c

@@ -104 +104 @@
       fprintf(stderr,"Function successfully loaded\n");
 #endif
+      jclass scHashMapClass,scHashMap_class;
+      jmethodID scHashMap_constructor;
+      scHashMapClass = (*env)->FindClass(env, "java/util/HashMap");
+      scHashMap_class = (*env)->NewGlobalRef(env, scHashMapClass);
+      scHashMap_constructor = (*env)->GetMethodID(env, scHashMap_class, "<init>", "()V");
       /**
        * The 3 standard parameter for each services
        */
-      jobject arg1=HashMap_FromMaps(env,m);
-      jobject arg2=HashMap_FromMaps(env,inputs);
-      jobject arg3=HashMap_FromMaps(env,outputs);
+      jobject arg1=HashMap_FromMaps(env,m,scHashMapClass,scHashMap_class,scHashMap_constructor);
+      jobject arg2=HashMap_FromMaps(env,inputs,scHashMapClass,scHashMap_class,scHashMap_constructor);
+      jobject arg3=HashMap_FromMaps(env,outputs,scHashMapClass,scHashMap_class,scHashMap_constructor);
       jint pValue=0;
 
@@ -115 +120 @@
       if (pValue != NULL){
         res=pValue;
-        //inputs=mapsFromHashMap(env,arg2);
-        outputs=mapsFromHashMap(env,arg3);
+        m=mapsFromHashMap(env,arg1,scHashMapClass);
+        *main_conf=m;
+        outputs=mapsFromHashMap(env,arg3,scHashMapClass);
         *real_outputs=outputs;
 
@@ -123 +129 @@
         dumpMaps(inputs);
         dumpMaps(outputs);
-        /*fprintf(stderr,"printProcessResponse(%i,\"%s\",%i,inputs,outputs);",
-          getpid(),tmp->value,PyInt_AsLong(pValue));*/
 #endif
       }else{      
@@ -180 +184 @@
 }
 
-jobject HashMap_FromMaps(JNIEnv *env,maps* t){
-  jclass scHashMapClass,scHashMap_class;
-  jmethodID scHashMap_constructor;
+jobject HashMap_FromMaps(JNIEnv *env,maps* t,jclass scHashMapClass,jclass scHashMap_class,jmethodID scHashMap_constructor){
   jobject scObject,scObject1;
-  scHashMapClass = (*env)->FindClass(env, "java/util/HashMap");
-  scHashMap_class = (*env)->NewGlobalRef(env, scHashMapClass);
-  scHashMap_constructor = (*env)->GetMethodID(env, scHashMap_class, "<init>", "()V");   
   if(scHashMap_constructor!=NULL){
     scObject = (*env)->NewObject(env, scHashMap_class, scHashMap_constructor);
@@ -204 +203 @@
       (*env)->CallObjectMethod(env,scObject, put_mid, (*env)->NewStringUTF(env,tmp->name), scObject1);
       tmp=tmp->next;
-    } 
+    }
     return scObject;
   }
@@ -211 +210 @@
 }
 
-maps* mapsFromHashMap(JNIEnv *env,jobject t){
+maps* mapsFromHashMap(JNIEnv *env,jobject t,jclass scHashMapClass){
 #ifdef DEBUG
   fprintf(stderr,"mapsFromHashMap start\n");
@@ -224 +223 @@
    * }
    */
-  jclass scHashMapClass,scHashMap_class,scSetClass,scIteratorClass,scMapEntryClass,scSet_class,scMapClass;
+  jclass scHashMap_class,scSetClass,scIteratorClass,scMapEntryClass,scSet_class,scMapClass;
   jmethodID entrySet_mid,iterator_mid,hasNext_mid,next_mid,getKey_mid,getValue_mid;
   jobject scObject,scObject1;
-  scHashMapClass=(*env)->GetObjectClass(env,t);
-  //scMapClass=(*env)->FindClass(env, "java/util/HashMap");
-  //scHashMapClass = (*env)->FindClass(env, "java/util/HashMap");
   if(scHashMapClass==NULL){
     fprintf(stderr,"Unable to load java.util.HashMap\n");
@@ -276 +272 @@
   maps* final_res=NULL;
   map* res=NULL;
-#ifdef DEBUG
-  int i=0;
-#endif
   while((*env)->CallBooleanMethod(env,final_iterator,hasNext_mid)){
-#ifdef DEBUG
-    fprintf(stderr,"mapsFromHashMap loop %d\n",i);
-    i++;
-#endif
     jobject tmp=(*env)->CallObjectMethod(env,final_iterator,next_mid);
 
@@ -289 +278 @@
     jobject set=(*env)->CallObjectMethod(env,imap,entrySet_mid);
     jobject iterator=(*env)->CallObjectMethod(env,set,iterator_mid);
-#ifdef DEBUG
-    int j=0;
-#endif
+
     while((*env)->CallBooleanMethod(env,iterator,hasNext_mid)){
-#ifdef DEBUG
-      fprintf(stderr,"mapsFromHashMap internal loop %d\n",j);
-      j++;
-#endif
       jobject tmp1=(*env)->CallObjectMethod(env,iterator,next_mid);
       jobject jk=(*env)->CallObjectMethod(env,tmp1,getKey_mid);
@@ -310 +293 @@
         res=createMap((*env)->GetStringUTFChars(env, jk, NULL),
                       (*env)->GetStringUTFChars(env, jv, NULL));
-      }else
+      }else{
         addToMap(res,(*env)->GetStringUTFChars(env, jk, NULL),
                  (*env)->GetStringUTFChars(env, jv, NULL));
+      }
     }
     jobject jk=(*env)->CallObjectMethod(env,tmp,getKey_mid);
     maps* cmap=(maps*)malloc(sizeof(maps));
     cmap->name=(*env)->GetStringUTFChars(env, jk, NULL);
+#ifdef DEBUG
+    fprintf(stderr," / %s \n",cmap->name);
+#endif
     cmap->content=res;
     cmap->next=NULL;
-    if(final_res==NULL){
+    if(final_res==NULL)
       final_res=dupMaps(&cmap);
-    }else
+    else
       addMapsToMaps(&final_res,cmap);
-    final_res->next=NULL;
     freeMaps(&cmap);
     free(cmap);