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

Timestamp:

May 30, 2016, 7:12:12 PM (8 years ago)

Author:

djay

Message:

Fix issue when running service in asynch mode with missing parameters.

File:

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

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

@@ -85 +85 @@
   fprintf(stderr,"(%s)\n",oclasspath);
 #endif
-
+#ifndef WIN32
   int nb=1;
+#endif
   int nbc0=0;
   maps* javaXXMap=getMaps(*main_conf,"javaxx");
@@ -98 +99 @@
   }
 #ifdef WIN32
-  nb=2+nbc0+nbc1;
-  JavaVMOption options[nb];
+  //#define nb (2+nbc0+nbc1)
+  const int nb=2+nbc0+nbc1;
+  JavaVMOption *options=(JavaVMOption*)malloc(nb*sizeof(JavaVMOption));
 #else
   JavaVMOption options[nb+nbc0+nbc1+1];
@@ -259 +261 @@
     free(options[start+i].optionString);
   }
+#ifdef WIN32
+  free(options);
+#endif
   return res;
 }