tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5 CoyoteResponse.java
Date Mon, 19 May 2003 23:06:46 GMT
remm        2003/05/19 16:06:46

  Modified:    catalina/src/share/org/apache/coyote/tomcat5
                        CoyoteResponse.java
  Log:
  - Fix bug revealed by the switch to the new mapper.
  - I don't see any reason to keep two separate context fields (one in request,
    and one in response).
  
  Revision  Changes    Path
  1.4       +7 -12     jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteResponse.java
  
  Index: CoyoteResponse.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteResponse.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CoyoteResponse.java	8 May 2003 01:24:27 -0000	1.3
  +++ CoyoteResponse.java	19 May 2003 23:06:46 -0000	1.4
  @@ -207,15 +207,10 @@
   
   
       /**
  -     * The Context within which this Request is being processed.
  -     */
  -    protected Context context = null;
  -
  -    /**
        * Return the Context within which this Request is being processed.
        */
       public Context getContext() {
  -        return (this.context);
  +        return (request.getContext());
       }
   
       /**
  @@ -227,7 +222,7 @@
        * @param context The newly associated Context
        */
       public void setContext(Context context) {
  -        this.context = context;
  +        request.setContext(context);
       }
   
   
  @@ -794,7 +789,7 @@
               return;
           }
   
  -        CharsetMapper cm = context.getCharsetMapper();
  +        CharsetMapper cm = getContext().getCharsetMapper();
           String charset = cm.getCharset( locale );
           if ( charset != null ){
               coyoteResponse.setCharacterEncoding(charset);
  
  
  

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


Mime
View raw message