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

[costin]

costin      02/04/11 17:04:27

  Modified:    jk/native2/common jk_uriMap.c
  Log:
  Config simplification: if no worker is specified, use the default worker.
  
  Revision  Changes    Path
  1.21      +10 -2     jakarta-tomcat-connectors/jk/native2/common/jk_uriMap.c
  
  Index: jk_uriMap.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_uriMap.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- jk_uriMap.c       26 Mar 2002 03:03:01 -0000      1.20
  +++ jk_uriMap.c       12 Apr 2002 00:04:27 -0000      1.21
  @@ -67,7 +67,7 @@
    * servlet container.                                                      
    *                                                                         
    * Author:      Gal Shachor <[EMAIL PROTECTED]>                           
  - * Version:     $Revision: 1.20 $                                           
  + * Version:     $Revision: 1.21 $                                           
    */
   
   #include "jk_pool.h"
  @@ -183,6 +183,11 @@
       uriMap->maps[uriMap->size] = uriEnv;
       uriMap->size++;
   
  +    env->l->jkLog(env, env->l, JK_LOG_INFO,
  +                  "uriMap.addUriEnv() %s\n", uriEnv->uri);
  +
  +    
  +    
       return JK_TRUE;
   }
   
  @@ -266,6 +271,9 @@
                                 "uriMap.init() map to invalid worker %s %s\n",
                                 _this->maps[i]->uri, wname);
               }
  +        } else {
  +            _this->maps[i]->worker= workerEnv->defaultWorker;
  +            _this->maps[i]->workerName= workerEnv->defaultWorker->mbean->name;
           }
       }
       
  @@ -491,7 +499,7 @@
       _this->checkUri=jk2_uriMap_checkUri;
       _this->mapUri=jk2_uriMap_mapUri;
       _this->maps = NULL;
  -    _this->debug= 1;
  +    _this->debug= 2;
               
       result->object=_this;
       result->setAttribute=jk2_uriMap_setProperty;
  
  
  

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