Changeset 747 for trunk/zoo-project/zoo-kernel

Timestamp:

Dec 18, 2015, 9:49:09 PM (9 years ago)

Author:

djay

Message:

Small fix in java support.

Location:

trunk/zoo-project/zoo-kernel

Files:

• response_print.c (modified) (1 diff)
• service_internal_java.c (modified) (5 diffs)

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

@@ -2244 +2244 @@
   n = xmlNewNode(ns, BAD_CAST "ExceptionReport");
   map* version=getMapFromMaps(m,"main","rversion");
-  int vid=getVersionId(version->value);
+  int vid=-1;
+  if(version!=NULL)
+    vid=getVersionId(version->value);
   if(vid<0)
     vid=0;

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

@@ -101 +101 @@
   JavaVMOption options[nb];
 #else
-  JavaVMOption options[nb+nbc0+nbc1];
+  JavaVMOption options[nb+nbc0+nbc1+1];
 #endif
   JavaVMInitArgs vm_args;
@@ -121 +121 @@
   if(javaXMap!=NULL)
     cursorx=javaXMap->content;
-  options[0].optionString = oclasspath;
+  options[0].optionString = zStrdup(oclasspath);
+  options[0].extraInfo=NULL;
 #ifdef WIN32
   start=2;
@@ -131 +132 @@
     char *tmp=parseJVMXXOption(cursorxx);
     options[start+i].optionString = tmp;
+    options[start+i].extraInfo=NULL;
     free(tmp);
     cursorxx=cursorxx->next;
@@ -137 +139 @@
     char *tmp=parseJVMXOption(cursorx);
     options[start+i].optionString = tmp;
+    options[start+i].extraInfo=NULL;
     free(tmp);
     cursorx=cursorx->next;
@@ -310 +313 @@
  */
 char *parseJVMXXOption(map* m){
-  char *res=(char*)malloc((strlen(m->name)+strlen(m->value)+5)*sizeof(char));
+  char *res=(char*)malloc((strlen(m->name)+strlen(m->value)+6)*sizeof(char));
   if(strncasecmp(m->value,"minus",5)==0)
     sprintf(res,"-XX:-%s",m->name);