You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by qu...@apache.org on 2003/06/20 01:07:28 UTC

cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/util/uri BaseURI.java

quintonm    2003/06/19 16:07:28

  Modified:    src/java/org/apache/turbine/util/uri BaseURI.java
  Log:
  encodeResponse() was setting res=uri in two places.  With this change,
  res is initialized with the value of uri.
  
  Revision  Changes    Path
  1.5       +2 -4      jakarta-turbine-2/src/java/org/apache/turbine/util/uri/BaseURI.java
  
  Index: BaseURI.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/uri/BaseURI.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- BaseURI.java	27 May 2003 22:29:54 -0000	1.4
  +++ BaseURI.java	19 Jun 2003 23:07:27 -0000	1.5
  @@ -512,14 +512,13 @@
        */
       protected String encodeResponse(String uri)
       {
  -        String res = null;
  +        String res = uri;
   
           HttpServletResponse response = getResponse();
   
           if(response == null)
           {
               log.debug("No Response Object!");
  -            res = uri;
           }
           else
           {
  @@ -539,7 +538,6 @@
               {
                   log.error("response" + response + ", uri: " + uri);
                   log.error("While trying to encode the URI: ", e);
  -                res = uri;
               }
           }
   
  
  
  

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