Return-Path: 
 <tomcat-dev-return-5243-qmlist-jakarta-archive-tomcat-dev=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-tomcat-dev-archive@apache.org
Received: (qmail 55617 invoked from network); 9 Feb 2002 16:24:09 -0000
Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131)
  by daedalus.apache.org with SMTP; 9 Feb 2002 16:24:09 -0000
Received: (qmail 8366 invoked by uid 97); 9 Feb 2002 16:24:04 -0000
Delivered-To: qmlist-jakarta-archive-tomcat-dev@jakarta.apache.org
Received: (qmail 8342 invoked by uid 97); 9 Feb 2002 16:24:03 -0000
Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:tomcat-dev-subscribe@jakarta.apache.org>
List-Help: <mailto:tomcat-dev-help@jakarta.apache.org>
List-Post: <mailto:tomcat-dev@jakarta.apache.org>
List-Id: "Tomcat Developers List" <tomcat-dev.jakarta.apache.org>
Reply-To: "Tomcat Developers List" <tomcat-dev@jakarta.apache.org>
Delivered-To: mailing list tomcat-dev@jakarta.apache.org
Received: (qmail 8331 invoked by uid 97); 9 Feb 2002 16:24:03 -0000
Date: 9 Feb 2002 16:23:59 -0000
Message-ID: <20020209162359.95848.qmail@icarus.apache.org>
From: remm@apache.org
To: jakarta-tomcat-4.0-cvs@apache.org
Subject: cvs commit:
 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp
 WarpRequest.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

remm        02/02/09 08:23:59

  Modified:    catalina/src/share/org/apache/catalina/connector/warp Tag:
                        tomcat_40_branch WarpRequest.java
  Log:
  - Update WARP.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.8.2.2   +6 -5      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp/Attic/WarpRequest.java
  
  Index: WarpRequest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp/Attic/WarpRequest.java,v
  retrieving revision 1.8.2.1
  retrieving revision 1.8.2.2
  diff -u -r1.8.2.1 -r1.8.2.2
  --- WarpRequest.java	17 Jan 2002 12:17:16 -0000	1.8.2.1
  +++ WarpRequest.java	9 Feb 2002 16:23:59 -0000	1.8.2.2
  @@ -180,11 +180,6 @@
           throws IOException {
               if (closed) throw new IOException("Stream closed");
   
  -            if (packet.getType()==Constants.TYPE_CBK_DONE) return(-1);
  -
  -            if (packet.getType()!=Constants.TYPE_CBK_DATA)
  -                throw new IOException("Invalid WARP packet type for body");
  -
               if (this.packet.pointer<this.packet.size)
                   return(((int)this.packet.buffer[this.packet.pointer++])&0x0ff);
   
  @@ -195,6 +190,12 @@
               packet.reset();
   
               this.request.getConnection().recv(packet);
  +
  +            if (packet.getType()==Constants.TYPE_CBK_DONE) return(-1);
  +
  +            if (packet.getType()!=Constants.TYPE_CBK_DATA)
  +                throw new IOException("Invalid WARP packet type for body");
  +
               return(this.read());
           }
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>