cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav/logger StatusHttpServletResponseWrapper.java

[oz...@apache.org]

ozeigermann    2004/05/13 03:42:03

  Modified:    src/webdav/server/org/apache/slide/webdav/filter
                        LogFilter.java
  Added:       src/webdav/server/org/apache/slide/webdav/logger
                        StatusHttpServletResponseWrapper.java
  Log:
  Logger no longer buffers body of request and response to fix issue described in 28894
  
  Revision  Changes    Path
  1.9       +8 -8      jakarta-slide/src/webdav/server/org/apache/slide/webdav/filter/LogFilter.java
  
  Index: LogFilter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/filter/LogFilter.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- LogFilter.java	2 Apr 2004 07:30:28 -0000	1.8
  +++ LogFilter.java	13 May 2004 10:42:03 -0000	1.9
  @@ -40,8 +40,8 @@
   import javax.servlet.ServletResponse;
   import javax.servlet.http.HttpServletRequest;
   import javax.servlet.http.HttpServletResponse;
  -import org.apache.slide.webdav.logger.XHttpServletRequestFacade;
  -import org.apache.slide.webdav.logger.XHttpServletResponseFacade;
  +
  +import org.apache.slide.webdav.logger.StatusHttpServletResponseWrapper;
   import org.apache.util.WebdavStatus;
   
   /**
  @@ -117,8 +117,8 @@
        *
        */
       public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
  -        XHttpServletRequestFacade req = new XHttpServletRequestFacade((HttpServletRequest)request);
  -        XHttpServletResponseFacade resp = new XHttpServletResponseFacade((HttpServletResponse)response);
  +        HttpServletRequest req = (HttpServletRequest)request;
  +        StatusHttpServletResponseWrapper resp = new StatusHttpServletResponseWrapper((HttpServletResponse)response);
           long start = System.currentTimeMillis();
   
           // incomming
  
  
  
  1.1                  jakarta-slide/src/webdav/server/org/apache/slide/webdav/logger/StatusHttpServletResponseWrapper.java
  
  Index: StatusHttpServletResponseWrapper.java
  ===================================================================
  /*
   * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/logger/StatusHttpServletResponseWrapper.java,v 1.1 2004/05/13 10:42:03 ozeigermann Exp $
   * $Revision: 1.1 $
   * $Date: 2004/05/13 10:42:03 $
   *
   * ====================================================================
   *
   * Copyright 1999-2002 The Apache Software Foundation 
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   *
   *     http://www.apache.org/licenses/LICENSE-2.0
   *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   * See the License for the specific language governing permissions and
   * limitations under the License.
   *
   */
  
  
  package org.apache.slide.webdav.logger;
  
  import java.io.IOException;
  
  import javax.servlet.http.HttpServletResponse;
  import javax.servlet.http.HttpServletResponseWrapper;
  
  import org.apache.slide.common.Domain;
  
  /**
   * This class supports additional set-methods and a re-readable
   * inputstream to the interface javax.servlet.http.HttpServletResponse.
   *
   * @author    Hardy.Kiefer@softwareag.com
   *            Christopher Lenz (cmlenz at apache.org)
   *
   * @version   0.1
   *
   * @invariant (inputStream != null)
   *
   * @see       javax.servlet.http.HttpServletResponse
   *
   */
  public class StatusHttpServletResponseWrapper extends HttpServletResponseWrapper
  {
  
      
      private int statusCode = -1;
      private String statusText = "";
      
      /**
       * This constructor creates an re-writable HttpServletRes�pmse.
       *
       * @pre        (response != null)
       * @post
       *
       * @param      response   HttpServletResponse
       *
       * @time
       * @space
       */
      public StatusHttpServletResponseWrapper(HttpServletResponse response) {
          super(response);
          Domain.debug("Create XHttpServletResponseFacade");
      }
  
  
      public int getStatus() {
          return statusCode;
      }
      public String getStatusText() {
          return statusText;
      }
      public void setStatus(int sc) {
          statusCode = sc;
          super.setStatus(sc);
      }
      public void setStatus(int sc, String msg) {
          statusCode = sc;
          statusText = msg;
          super.setStatus(sc, msg);
      }
      public void sendError( int sc ) throws IOException {
          statusCode = sc;
          super.sendError(sc);
      }
      public void sendError( int sc, String msg ) throws IOException {
          statusCode = sc;
          statusText = msg;
          super.sendError(sc, msg);
      }
  }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org