cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/server/tomcat33 JkRequest33.java

[costin]

costin      02/04/04 11:00:10

  Modified:    jk/java/org/apache/jk/common HandlerRequest.java
               jk/java/org/apache/jk/core JkHandler.java
               jk/java/org/apache/jk/server/tomcat33 JkRequest33.java
  Log:
  Change to instanceId
  
  Revision  Changes    Path
  1.9       +1 -1      
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/HandlerRequest.java
  
  Index: HandlerRequest.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/HandlerRequest.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- HandlerRequest.java       3 Apr 2002 23:56:08 -0000       1.8
  +++ HandlerRequest.java       4 Apr 2002 19:00:09 -0000       1.9
  @@ -512,7 +512,7 @@
                   break;
                
            case SC_A_JVM_ROUTE    :
  -                msg.getBytes(req.getWorkerId());
  +                msg.getBytes(req.instanceId());
                   break;
                
            case SC_A_SSL_CERT     :
  
  
  
  1.3       +1 -2      
jakarta-tomcat-connectors/jk/java/org/apache/jk/core/JkHandler.java
  
  Index: JkHandler.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/core/JkHandler.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JkHandler.java    20 Feb 2002 23:39:02 -0000      1.2
  +++ JkHandler.java    4 Apr 2002 19:00:09 -0000       1.3
  @@ -74,6 +74,7 @@
       private Properties properties=new Properties();
       protected WorkerEnv wEnv;
       protected JkHandler next;
  +    protected String nextName=null;
       protected String name;
       protected int id;
   
  @@ -104,8 +105,6 @@
           this.id=id;
       }
   
  -    String nextName=null;
  -    
       /** Catalina-style "recursive" invocation.
        *  A chain is used for Apache/3.3 style iterative invocation.
        */
  
  
  
  1.5       +3 -3      
jakarta-tomcat-connectors/jk/java/org/apache/jk/server/tomcat33/JkRequest33.java
  
  Index: JkRequest33.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/server/tomcat33/JkRequest33.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JkRequest33.java  3 Apr 2002 23:56:08 -0000       1.4
  +++ JkRequest33.java  4 Apr 2002 19:00:09 -0000       1.5
  @@ -79,8 +79,8 @@
   class JkRequest33 extends org.apache.tomcat.core.Request 
   {
       org.apache.coyote.Request ajpReq;
  -    MsgContext ep;
   
  +    MsgContext ep;
       JkInputStream jkIS;
       
       public JkRequest33(org.apache.coyote.Request ajpReq) 
  @@ -146,11 +146,11 @@
       }
   
       public String getJvmRoute() {
  -     return ajpReq.getWorkerId().toString();
  +     return ajpReq.instanceId().toString();
       }
       
       public void setJvmRoute(String s ) {
  -     ajpReq.getWorkerId().setString(s);
  +     ajpReq.instanceId().setString(s);
       }
   
       // XXX scheme
  
  
  

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