Changeset 9 for trunk/zoo-kernel/service_internal_java.c
- Timestamp:
- Sep 14, 2010, 2:04:55 PM (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/zoo-kernel/service_internal_java.c
r1 r9 86 86 addToMap(err,"code","NoApplicableCode"); 87 87 printExceptionReportResponse(m,err); 88 freeMap(&err); 89 free(err); 88 90 (*jvm)->DestroyJavaVM(jvm); 89 91 return 1; … … 148 150 addToMap(err,"code","NoApplicableCode"); 149 151 printExceptionReportResponse(m,err); 152 freeMap(&err); 153 free(err); 150 154 (*jvm)->DestroyJavaVM(jvm); 151 return 1;155 return -1; 152 156 } 153 157 } … … 155 159 char tmpS[1024]; 156 160 sprintf(tmpS, "Cannot find function %s \n", s->name); 157 map* tmps=createMap("text",tmpS); 158 printExceptionReportResponse(m,tmps); 161 map* err=createMap("text",tmpS); 162 printExceptionReportResponse(m,err); 163 freeMap(&err); 164 free(err); 159 165 (*jvm)->DestroyJavaVM(jvm); 160 exit(-1);166 return -1; 161 167 } 162 168 }else{ 163 169 char tmpS[1024]; 164 170 sprintf(tmpS, "Cannot find function %s \n", tmp->value); 165 map* tmps=createMap("text",tmpS); 166 printExceptionReportResponse(m,tmps); 167 if (PyErr_Occurred()) 168 PyErr_Print(); 171 map* err=createMap("text",tmpS); 172 printExceptionReportResponse(m,err); 173 freeMap(&err); 174 free(err); 175 (*jvm)->DestroyJavaVM(jvm); 176 return -1; 169 177 } 170 178 (*jvm)->DestroyJavaVM(jvm); … … 312 320 cmap->next=NULL; 313 321 if(final_res==NULL){ 314 final_res= cmap;322 final_res=dupMaps(&cmap); 315 323 }else 316 addMapsToMaps( final_res,cmap);324 addMapsToMaps(&final_res,cmap); 317 325 final_res->next=NULL; 326 freeMaps(&cmap); 327 free(cmap); 328 cmap=NULL; 318 329 res=NULL; 319 330 }
Note: See TracChangeset
for help on using the changeset viewer.