cvs commit: jakarta-tomcat-connectors/webapp/java WarpConfigurationHandler.java WarpConnection.java

[pier]

pier        01/07/18 21:19:02

  Modified:    webapp/java WarpConfigurationHandler.java
                        WarpConnection.java
  Log:
  Shutdown socket only in case of errors.
  
  Revision  Changes    Path
  1.8       +4 -0      
jakarta-tomcat-connectors/webapp/java/WarpConfigurationHandler.java
  
  Index: WarpConfigurationHandler.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/webapp/java/WarpConfigurationHandler.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- WarpConfigurationHandler.java     2001/07/19 02:45:33     1.7
  +++ WarpConfigurationHandler.java     2001/07/19 04:19:01     1.8
  @@ -140,6 +140,10 @@
                       return(true);
                   }
   
  +                case Constants.TYPE_DISCONNECT: {
  +                    return(false);
  +                }
  +
                   default: {
                       logger.log("Invalid packet with type "+packet.getType());
                       return(false);
  
  
  
  1.15      +4 -2      jakarta-tomcat-connectors/webapp/java/WarpConnection.java
  
  Index: WarpConnection.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/java/WarpConnection.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- WarpConnection.java       2001/07/18 23:12:49     1.14
  +++ WarpConnection.java       2001/07/19 04:19:01     1.15
  @@ -185,8 +185,10 @@
               this.input=this.socket.getInputStream();
               this.output=this.socket.getOutputStream();
               boolean success=new WarpConfigurationHandler().handle(this);
  -
  -            this.stop();
  +            if (!success) {
  +                logger.log("Configuration handler returned false");
  +                this.stop();
  +            }
           } catch (IOException e) {
               logger.log("Exception on socket",e);
           }