Changeset 393 for trunk

Timestamp:

Mar 15, 2013, 2:16:47 AM (12 years ago)

Author:

djay

Message:

Remove temporary file created when running service in background. Make compilation of JAVA support works using XCode 4.4.

Location:

trunk/zoo-project/zoo-kernel

Files:

• configure.ac (modified) (1 diff)
• service_conf.y (modified) (1 diff)
• service_internal.c (modified) (1 diff)
• zoo_service_loader.c (modified) (3 diffs)

trunk/zoo-project/zoo-kernel/configure.ac

@@ -317 +317 @@
         then
                 JAVA_LDFLAGS="-framework JavaVM"
-                JAVA_CPPFLAGS="-I/Developer//SDKs/MacOSX10.6.sdk/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers/"
+                JAVA_CPPFLAGS="-I/Applications/Xcode.app/Contents/Developer//Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers/"
         else
                 if test -d "$JDKHOME/jre/lib/i386";

trunk/zoo-project/zoo-kernel/service_conf.y

@@ -13 +13 @@
 #include <ctype.h>
 #include <service.h>
-  //#include <vector>
 
 static int tmp_count=1;

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

@@ -1359 +1359 @@
     /* We need to write the ExecuteResponse Document somewhere */
     FILE* output=fopen(stored_path,"w");
+    if(output==NULL){
+      /* If the file cannot be created return an ExceptionReport */
+      char tmpMsg[1024];
+      sprintf(tmpMsg,_("Unable to create the file : \"%s\" for storing the ExecuteResponse."),stored_path);
+      map * errormap = createMap("text",tmpMsg);
+      addToMap(errormap,"code", "InternalError");
+      printExceptionReportResponse(m,errormap);
+      freeMap(&errormap);
+      free(errormap);
+      xmlCleanupParser();
+      zooXmlCleanupNs();
+      return;
+    }
     xmlChar *xmlbuff;
     int buffersize;

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

@@ -1975 +1975 @@
           
           sprintf(storageNameOnServer,"%s/%s",path->value,fileNameOnServer);
-          printf("\n\nName on server %s\n",storageNameOnServer);
 #ifdef DEBUG
           fprintf(stderr,"Name on server %s\n",storageNameOnServer);
@@ -2304 +2303 @@
     FILE* f3=fopen(fbkp,"wb+");
     free(fbkp);
-    free(fbkp1);
     fseek(f2,0,SEEK_END);
     long flen=ftell(f2);
@@ -2313 +2311 @@
     fclose(f2);
     fclose(f3);
+    unlink(fbkp1);
+    free(fbkp1);
   }