tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@locus.apache.org
Subject cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util ThreadPool.java
Date Tue, 30 May 2000 14:08:24 GMT
costin      00/05/30 07:08:23

  Modified:    src/share/org/apache/tomcat/util ThreadPool.java
  Added:       src/share/org/apache/tomcat/facade
                        ServletInputStreamFacade.java
  Log:
  Missing file.
  
  Revision  Changes    Path
  1.1                  jakarta-tomcat/src/share/org/apache/tomcat/facade/ServletInputStreamFacade.java
  
  Index: ServletInputStreamFacade.java
  ===================================================================
  /*
   * ====================================================================
   * 
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 1999 The Apache Software Foundation.  All rights 
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer. 
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution, if
   *    any, must include the following acknowlegement:  
   *       "This product includes software developed by the 
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowlegement may appear in the software itself,
   *    if and wherever such third-party acknowlegements normally appear.
   *
   * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
   *    Foundation" must not be used to endorse or promote products derived
   *    from this software without prior written permission. For written 
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache"
   *    nor may "Apache" appear in their names without prior written
   *    permission of the Apache Group.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   *
   * [Additional notices, if required by prior licensing conditions]
   *
   */ 
  
  
  package org.apache.tomcat.facade;
  
  import java.io.*;
  import javax.servlet.*;
  import org.apache.tomcat.core.*;
  import org.apache.tomcat.util.*;
  
  /**
   *
   */
  public class ServletInputStreamFacade extends ServletInputStream {
      private int bytesRead = 0;
      private int limit = -1;
  
      private Request reqA;
      private ByteBuffer inBuffer;
      
      ServletInputStreamFacade() {
      }
  
      void setRequest(Request reqA ) {
  	this.reqA=reqA;
  	inBuffer=reqA.getInputBuffer();
      }
  
      void recycle() {
  	
      }
      
      // -------------------- ServletInputStream methods 
      
      public int read() throws IOException {
  	return inBuffer.read();
      }
  
      public int read(byte[] b) throws IOException {
  	return read(b, 0, b.length);
      }
  
      public int read(byte[] b, int off, int len) throws IOException {
  	return inBuffer.read(b, off, len);
      }
      
  
      public int readLine(byte[] b, int off, int len) throws IOException {
  	// no changes - the default implementation is good
  	return super.readLine(b, off, len);
      }
  }
  
  
  
  1.7       +4 -4      jakarta-tomcat/src/share/org/apache/tomcat/util/ThreadPool.java
  
  Index: ThreadPool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/ThreadPool.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ThreadPool.java	2000/05/26 23:06:39	1.6
  +++ ThreadPool.java	2000/05/30 14:08:23	1.7
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/ThreadPool.java,v
1.6 2000/05/26 23:06:39 costin Exp $
  - * $Revision: 1.6 $
  - * $Date: 2000/05/26 23:06:39 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/ThreadPool.java,v
1.7 2000/05/30 14:08:23 costin Exp $
  + * $Revision: 1.7 $
  + * $Date: 2000/05/30 14:08:23 $
    *
    * ====================================================================
    *
  @@ -422,7 +422,7 @@
           public void run() {
               while(true) {
                   try {
  -                    // Wait for work.
  +		    // Wait for work.
                       synchronized(this) {
                           if(!shouldRun && !shouldTerminate) {
                               this.wait();
  
  
  

Mime
View raw message