Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@apache.org Received: (qmail 70722 invoked from network); 17 Apr 2002 22:39:10 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 17 Apr 2002 22:39:10 -0000 Received: (qmail 20021 invoked by uid 97); 17 Apr 2002 22:39:07 -0000 Delivered-To: qmlist-jakarta-archive-tomcat-dev@jakarta.apache.org Received: (qmail 19947 invoked by uid 97); 17 Apr 2002 22:39:06 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 19900 invoked by uid 97); 17 Apr 2002 22:39:06 -0000 Date: 17 Apr 2002 22:38:59 -0000 Message-ID: <20020417223859.69024.qmail@icarus.apache.org> From: costin@apache.org To: jakarta-tomcat-connectors-cvs@apache.org Subject: cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/common JkInputStream.java WorkerDummy.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N costin 02/04/17 15:38:59 Modified: jk/java/org/apache/jk/common JkInputStream.java WorkerDummy.java Log: Update for the interface changes Revision Changes Path 1.7 +5 -3 jakarta-tomcat-connectors/jk/java/org/apache/jk/common/JkInputStream.java Index: JkInputStream.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/JkInputStream.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- JkInputStream.java 9 Apr 2002 20:51:06 -0000 1.6 +++ JkInputStream.java 17 Apr 2002 22:38:59 -0000 1.7 @@ -273,7 +273,7 @@ public int doRead(ByteChunk responseChunk ) throws IOException { log.info( "JkInputStream: " + pos + " " + blen + " " + available ); if( blen == pos ) { - receive(); + refillReadBuffer(); } responseChunk.setBytes( bodyBuff, pos, blen-pos ); return blen - pos; @@ -285,7 +285,8 @@ */ public boolean receive() throws IOException { - int err = mc.getChannel().receive(bodyMsg, mc); + mc.setType( JkHandler.HANDLE_RECEIVE_PACKET ); + int err = mc.getSource().invoke(bodyMsg, mc); if(err < 0) { throw new IOException(); } @@ -332,7 +333,8 @@ if( log.isDebugEnabled() ) log.debug("refillReadBuffer " + Thread.currentThread()); - mc.getChannel().send(bodyMsg, mc); + mc.setType( JkHandler.HANDLE_SEND_PACKET ); + mc.getSource().invoke(bodyMsg, mc); return receive(); } 1.6 +5 -4 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.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- WorkerDummy.java 3 Apr 2002 23:56:08 -0000 1.5 +++ WorkerDummy.java 17 Apr 2002 22:38:59 -0000 1.6 @@ -109,8 +109,9 @@ msg.appendBytes(null); msg.appendInt(0); - - ep.getChannel().send( msg, ep ); + + ep.setType( JkHandler.HANDLE_SEND_PACKET ); + ep.getSource().invoke( msg, ep ); // msg.dump("out:" ); msg.reset(); @@ -119,13 +120,13 @@ msg.appendBytes( body ); - ep.getChannel().send(msg, ep); + ep.getSource().invoke(msg, ep); msg.reset(); msg.appendByte( HandlerRequest.JK_AJP13_END_RESPONSE ); msg.appendInt( 1 ); - ep.getChannel().send(msg, ep ); + ep.getSource().invoke(msg, ep ); return OK; } -- To unsubscribe, e-mail: For additional commands, e-mail: