Changeset 790 for trunk/zoo-project/zoo-kernel/service_internal_java.c

Timestamp:

Dec 19, 2016, 6:01:06 PM (7 years ago)

Author:

djay

Message:

Add support for nested inputs and outputs.

File:

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

trunk/zoo-project/zoo-kernel/service_internal_java.c

@@ -251 +251 @@
       if (pValue != (jint)NULL){
         res=pValue;
-        m=mapsFromHashMap(env,arg1,scHashMapClass);
-        *main_conf=m;
-        outputs=mapsFromHashMap(env,arg3,scHashMapClass);
-        *real_outputs=outputs;
-
+        freeMaps(real_outputs);
+        free(*real_outputs);
+        freeMaps(main_conf);
+        free(*main_conf);
+        *main_conf=mapsFromHashMap(env,arg1,scHashMapClass);
+        *real_outputs=mapsFromHashMap(env,arg3,scHashMapClass);
 #ifdef DEBUG
         fprintf(stderr,"Result of call: %i\n", pValue);
@@ -757 +758 @@
     jobject jk=(*env)->CallObjectMethod(env,tmp,getKey_mid);
 #endif
-    maps* cmap=(maps*)malloc(sizeof(maps));
-#ifdef JAVA7
-    cmap->name=(char*)(*env).GetStringUTFChars((jstring)jk, NULL);
-#else
-    cmap->name=(*env)->GetStringUTFChars(env, jk, NULL);
-#endif
+    maps* cmap=createMaps(
+#ifdef JAVA7
+      (char*)(*env).GetStringUTFChars((jstring)jk, NULL)
+#else
+      (*env)->GetStringUTFChars(env, jk, NULL)
+#endif
+                          );
 #ifdef DEBUG
     fprintf(stderr," / %s \n",cmap->name);
 #endif
     cmap->content=res;
-    cmap->next=NULL;
     if(final_res==NULL)
       final_res=dupMaps(&cmap);
@@ -780 +781 @@
   fprintf(stderr,"mapsFromHashMap end\n");
 #endif
-
   return final_res;
 }