billbarker    2005/05/15 13:16:32

  Modified:    jk/java/org/apache/jk/common Shm.java WorkerDummy.java
  Log:
  Oops missed a couple of files.
  
  Revision  Changes    Path
  1.16      +3 -3      
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/Shm.java
  
  Index: Shm.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/Shm.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- Shm.java  17 Sep 2004 18:34:18 -0000      1.15
  +++ Shm.java  15 May 2005 20:16:32 -0000      1.16
  @@ -160,7 +160,7 @@
           if( apr==null ) return;
           MsgContext mCtx=createMsgContext();
           Msg msg=(Msg)mCtx.getMsg(0);
  -        C2BConverter c2b=(C2BConverter)mCtx.getNote(C2B_NOTE);
  +        C2BConverter c2b=mCtx.getConverter();
           msg.reset();
   
           msg.appendByte( SHM_DUMP );
  @@ -182,7 +182,7 @@
           MsgContext mCtx=createMsgContext();
           Msg msg=(Msg)mCtx.getMsg(0);
           msg.reset();
  -        C2BConverter c2b=(C2BConverter)mCtx.getNote(C2B_NOTE);
  +        C2BConverter c2b=mCtx.getConverter();
           
           msg.appendByte( SHM_WRITE_SLOT );
           appendString( msg, slotName, c2b );
  @@ -225,7 +225,7 @@
           MsgContext mCtx=createMsgContext();
           Msg msg=(Msg)mCtx.getMsg(0);
           msg.reset();
  -        C2BConverter c2b=(C2BConverter)mCtx.getNote(C2B_NOTE);
  +        C2BConverter c2b=mCtx.getConverter();
           
           msg.appendByte( SHM_WRITE_SLOT );
           appendString( msg, slotName, c2b );
  
  
  
  1.11      +3 -3      
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/WorkerDummy.java
  
  Index: WorkerDummy.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/WorkerDummy.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- WorkerDummy.java  11 Jan 2005 13:37:46 -0000      1.10
  +++ WorkerDummy.java  15 May 2005 20:16:32 -0000      1.11
  @@ -59,7 +59,7 @@
           }
   
           msg.reset();
  -        msg.appendByte(HandlerRequest.JK_AJP13_SEND_HEADERS);
  +        msg.appendByte(AjpConstants.JK_AJP13_SEND_HEADERS);
           msg.appendInt(200);
           msg.appendBytes(null);
   
  @@ -70,7 +70,7 @@
           //         msg.dump("out:" );
   
           msg.reset();
  -        msg.appendByte( HandlerRequest.JK_AJP13_SEND_BODY_CHUNK);
  +        msg.appendByte( AjpConstants.JK_AJP13_SEND_BODY_CHUNK);
           msg.appendInt( body.getLength() );
           msg.appendBytes( body );
   
  @@ -78,7 +78,7 @@
           ep.getSource().invoke(msg, ep);
   
           msg.reset();
  -        msg.appendByte( HandlerRequest.JK_AJP13_END_RESPONSE );
  +        msg.appendByte( AjpConstants.JK_AJP13_END_RESPONSE );
           msg.appendInt( 1 );
           
           ep.getSource().invoke(msg, ep );
  
  
  

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

Reply via email to