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

Timestamp:

Sep 14, 2010, 2:04:55 PM (14 years ago)

Author:

djay

Message:

Update of both ZOO Kernel and ZOO Services (ogr base-vect-ops ServicesProvider?).
All the ZCFG files have been corrected to remove all references to wrong metadata (Test = Demo) to avoid validation issues.
Main Memory leaks has been removed from this version.
Addition of the Simplify Service in the C ogr base-vect-ops ServicesProvider? and addition of the Python version (without Simplify).
Update of the configure.ac and Makefile.in to follow dicussions on the mailing list and ensure to use our cgic206 and not another one, path to our cgic library is now directly in the Makefile.in file.
Accept the "-" character to name inputs, to solve issue on GRASS 7 integration.
Addition of the extension keyword for ZCFG file to be able to store resulting outputs in a file name using the extension suffix.
This version after a testing period shall be considerate as 1.0.1 version of the ZOO Project.

File:

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

trunk/zoo-kernel/service_internal_java.c

@@ -86 +86 @@
     addToMap(err,"code","NoApplicableCode");
     printExceptionReportResponse(m,err);
+    freeMap(&err);
+    free(err);
     (*jvm)->DestroyJavaVM(jvm);
     return 1;
@@ -148 +150 @@
         addToMap(err,"code","NoApplicableCode");
         printExceptionReportResponse(m,err);
+        freeMap(&err);
+        free(err);
         (*jvm)->DestroyJavaVM(jvm);
-        return 1;
+        return -1;
       }
     }
@@ -155 +159 @@
       char tmpS[1024];
       sprintf(tmpS, "Cannot find function %s \n", s->name);
-      map* tmps=createMap("text",tmpS);
-      printExceptionReportResponse(m,tmps);
+      map* err=createMap("text",tmpS);
+      printExceptionReportResponse(m,err);
+      freeMap(&err);
+      free(err);
       (*jvm)->DestroyJavaVM(jvm);
-      exit(-1);
+      return -1;
     }
   }else{
     char tmpS[1024];
     sprintf(tmpS, "Cannot find function %s \n", tmp->value);
-    map* tmps=createMap("text",tmpS);
-    printExceptionReportResponse(m,tmps);
-    if (PyErr_Occurred())
-      PyErr_Print();
+    map* err=createMap("text",tmpS);
+    printExceptionReportResponse(m,err);
+    freeMap(&err);
+    free(err);
+    (*jvm)->DestroyJavaVM(jvm);
+    return -1;
   }
   (*jvm)->DestroyJavaVM(jvm);
@@ -312 +320 @@
     cmap->next=NULL;
     if(final_res==NULL){
-      final_res=cmap;
+      final_res=dupMaps(&cmap);
     }else
-      addMapsToMaps(final_res,cmap);
+      addMapsToMaps(&final_res,cmap);
     final_res->next=NULL;
+    freeMaps(&cmap);
+    free(cmap);
+    cmap=NULL;
     res=NULL;
   }