cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/facade HttpServletRequestFacade.java

[keith]

keith       01/05/13 07:11:51

  Modified:    src/share/org/apache/tomcat/facade Tag: tomcat_32
                        HttpServletRequestFacade.java
  Log:
  The string 'httpDate.pe' will not be found in the core
  message bundle because it is in the util bundle.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.6.2.4   +5 -4      
jakarta-tomcat/src/share/org/apache/tomcat/facade/Attic/HttpServletRequestFacade.java
  
  Index: HttpServletRequestFacade.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/facade/Attic/HttpServletRequestFacade.java,v
  retrieving revision 1.6.2.3
  retrieving revision 1.6.2.4
  diff -u -r1.6.2.3 -r1.6.2.4
  --- HttpServletRequestFacade.java     2001/03/22 14:51:54     1.6.2.3
  +++ HttpServletRequestFacade.java     2001/05/13 14:11:49     1.6.2.4
  @@ -82,7 +82,8 @@
    */
   final class HttpServletRequestFacade implements HttpServletRequest {
       // Use the strings from core
  -    private static StringManager sm = 
StringManager.getManager("org.apache.tomcat.core");
  +    private static StringManager smCore = 
StringManager.getManager("org.apache.tomcat.core");
  +    private static StringManager smUtil = 
StringManager.getManager("org.apache.tomcat.util");
   
       private Request request;
   
  @@ -163,7 +164,7 @@
        
        long date=RequestUtil.toDate(value);
        if( date==-1) {
  -         String msg = sm.getString("httpDate.pe", value);
  +         String msg = smUtil.getString("httpDate.pe", value);
            throw new IllegalArgumentException(msg);
        }
        return date;
  @@ -185,7 +186,7 @@
        */
       public ServletInputStream getInputStream() throws IOException {
        if (usingReader) {
  -         String msg = sm.getString("reqfac.getinstream.ise");
  +         String msg = smCore.getString("reqfac.getinstream.ise");
            throw new IllegalStateException(msg);
        }
        usingStream = true;
  @@ -266,7 +267,7 @@
        */
       public BufferedReader getReader() throws IOException {
        if (usingStream) {
  -         String msg = sm.getString("reqfac.getreader.ise");
  +         String msg = smCore.getString("reqfac.getreader.ise");
            throw new IllegalStateException(msg);
        }
        usingReader = true;