tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@apache.org
Subject cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core Request.java
Date Thu, 08 Mar 2001 14:31:37 GMT
costin      01/03/08 06:31:35

  Modified:    src/share/org/apache/tomcat/core Request.java
  Log:
  Ops, wrong directory... Fix the last night's commit - sorry about it.
  
  ( the CVS should be closed during night time :-)
  
  Revision  Changes    Path
  1.97      +9 -3      jakarta-tomcat/src/share/org/apache/tomcat/core/Request.java
  
  Index: Request.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Request.java,v
  retrieving revision 1.96
  retrieving revision 1.97
  diff -u -r1.96 -r1.97
  --- Request.java	2001/03/08 07:23:02	1.96
  +++ Request.java	2001/03/08 14:31:34	1.97
  @@ -248,8 +248,14 @@
       
       public void setContextManager( ContextManager cm ) {
   	contextM=cm;
  -	encodingInfo=cm.getNote( ContextManager.REQUEST_NOTE,"req.encoding" );
  -	attributeInfo=cm.getNote( ContextManager.REQUEST_NOTE,"req.attribute" );
  +	try {
  +	    encodingInfo=cm.getNoteId( ContextManager.REQUEST_NOTE,
  +				       "req.encoding" );
  +	    attributeInfo=cm.getNoteId( ContextManager.REQUEST_NOTE,
  +					"req.attribute" );
  +	} catch( TomcatException ex ) {
  +	    ex.printStackTrace();
  +	}
       }
   
       public ContextManager getContextManager() {
  @@ -398,7 +404,7 @@
   	}
   	if( result != null ) {
   	    charEncoding=(String)result;
  -	    return;
  +	    return charEncoding;
   	}
   	
           charEncoding = ContentType.getCharsetFromContentType(getContentType());
  
  
  

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


Mime
View raw message