cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_vm_default.c

[costin]

costin      02/02/06 11:15:25

  Modified:    jk/native2/common jk_vm_default.c
  Log:
  Update the defaults for the current naming conventions.
  
  Revision  Changes    Path
  1.3       +7 -11     jakarta-tomcat-connectors/jk/native2/common/jk_vm_default.c
  
  Index: jk_vm_default.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_vm_default.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- jk_vm_default.c   26 Jan 2002 07:10:30 -0000      1.2
  +++ jk_vm_default.c   6 Feb 2002 19:15:25 -0000       1.3
  @@ -121,9 +121,9 @@
   
   /** Where to try to find jk jars ( if user doesn't specify it explicitely ) */
   static const char *defaultJK_PATH[]={
  -    "$(tomcat.home)$(fs)modules$(fs)jk$(fs)WEB-INF$(fs)lib$(fs)jk2.jar",
  +    "$(tomcat.home)$(fs)modules$(fs)jk$(fs)WEB-INF$(fs)lib$(fs)tomcat-jk2.jar",
    "$(tomcat.home)$(fs)modules$(fs)jk$(fs)WEB-INF$(fs)lib$(fs)tomcat-utils.jar",
  -    "$(tomcat.home)$(fs)webapps(fs)jk$(fs)WEB-INF$(fs)lib$(fs)ajp.jar",
  +    "$(tomcat.home)$(fs)webapps(fs)jk$(fs)WEB-INF$(fs)lib$(fs)tomcat-jk2.jar",
    "$(tomcat.home)$(fs)webapps(fs)jk$(fs)WEB-INF$(fs)lib$(fs)tomcat-utils.jar",
       NULL
   };
  @@ -409,20 +409,16 @@
   
       if(vm_args.classpath) {
           unsigned len = strlen(vm_args.classpath) + 
  -                       strlen(p->tomcat_classpath) + 
  -                       3;
  +            strlen(p->tomcat_classpath) +  3;
           char *tmp = p->pool->alloc(env, p->pool, len);
  -        if(tmp) {
  -            sprintf(tmp, "%s%c%s", 
  -                    p->tomcat_classpath, 
  -                    PATH_SEPERATOR,
  -                    vm_args.classpath);
  -            p->tomcat_classpath = tmp;
  -        } else {
  +        if(tmp==NULL) { 
               env->l->jkLog(env, env->l, JK_LOG_EMERG, 
                             "Fail-> allocation error for classpath\n"); 
               return JK_FALSE;
           }
  +        sprintf(tmp, "%s%c%s", p->tomcat_classpath, 
  +                PATH_SEPERATOR, vm_args.classpath);
  +        p->tomcat_classpath = tmp;
       }
       
       vm_args.classpath = p->tomcat_classpath;
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>