Changeset 747 for trunk


Ignore:
Timestamp:
Dec 18, 2015, 9:49:09 PM (8 years ago)
Author:
djay
Message:

Small fix in java support.

Location:
trunk/zoo-project/zoo-kernel
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/zoo-project/zoo-kernel/response_print.c

    r746 r747  
    22442244  n = xmlNewNode(ns, BAD_CAST "ExceptionReport");
    22452245  map* version=getMapFromMaps(m,"main","rversion");
    2246   int vid=getVersionId(version->value);
     2246  int vid=-1;
     2247  if(version!=NULL)
     2248    vid=getVersionId(version->value);
    22472249  if(vid<0)
    22482250    vid=0;
  • trunk/zoo-project/zoo-kernel/service_internal_java.c

    r640 r747  
    101101  JavaVMOption options[nb];
    102102#else
    103   JavaVMOption options[nb+nbc0+nbc1];
     103  JavaVMOption options[nb+nbc0+nbc1+1];
    104104#endif
    105105  JavaVMInitArgs vm_args;
     
    121121  if(javaXMap!=NULL)
    122122    cursorx=javaXMap->content;
    123   options[0].optionString = oclasspath;
     123  options[0].optionString = zStrdup(oclasspath);
     124  options[0].extraInfo=NULL;
    124125#ifdef WIN32
    125126  start=2;
     
    131132    char *tmp=parseJVMXXOption(cursorxx);
    132133    options[start+i].optionString = tmp;
     134    options[start+i].extraInfo=NULL;
    133135    free(tmp);
    134136    cursorxx=cursorxx->next;
     
    137139    char *tmp=parseJVMXOption(cursorx);
    138140    options[start+i].optionString = tmp;
     141    options[start+i].extraInfo=NULL;
    139142    free(tmp);
    140143    cursorx=cursorx->next;
     
    310313 */
    311314char *parseJVMXXOption(map* m){
    312   char *res=(char*)malloc((strlen(m->name)+strlen(m->value)+5)*sizeof(char));
     315  char *res=(char*)malloc((strlen(m->name)+strlen(m->value)+6)*sizeof(char));
    313316  if(strncasecmp(m->value,"minus",5)==0)
    314317    sprintf(res,"-XX:-%s",m->name);
Note: See TracChangeset for help on using the changeset viewer.

Search

Context Navigation

ZOO Sponsors

http://www.zoo-project.org/trac/chrome/site/img/geolabs-logo.pnghttp://www.zoo-project.org/trac/chrome/site/img/neogeo-logo.png http://www.zoo-project.org/trac/chrome/site/img/apptech-logo.png http://www.zoo-project.org/trac/chrome/site/img/3liz-logo.png http://www.zoo-project.org/trac/chrome/site/img/gateway-logo.png

Become a sponsor !

Knowledge partners

http://www.zoo-project.org/trac/chrome/site/img/ocu-logo.png http://www.zoo-project.org/trac/chrome/site/img/gucas-logo.png http://www.zoo-project.org/trac/chrome/site/img/polimi-logo.png http://www.zoo-project.org/trac/chrome/site/img/fem-logo.png http://www.zoo-project.org/trac/chrome/site/img/supsi-logo.png http://www.zoo-project.org/trac/chrome/site/img/cumtb-logo.png

Become a knowledge partner

Related links

http://zoo-project.org/img/ogclogo.png http://zoo-project.org/img/osgeologo.png