cvs commit: cocoon-2.1/src/java/org/apache/cocoon/servlet CocoonServlet.java

[vgritsenko]

vgritsenko    2003/12/02 06:47:21

  Modified:    src/java/org/apache/cocoon/servlet CocoonServlet.java
  Log:
  Fix bug 25132: Do not double decode URI in CocoonServlet
  
  Revision  Changes    Path
  1.21      +3 -3      
cocoon-2.1/src/java/org/apache/cocoon/servlet/CocoonServlet.java
  
  Index: CocoonServlet.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/servlet/CocoonServlet.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- CocoonServlet.java        3 Nov 2003 21:23:45 -0000       1.20
  +++ CocoonServlet.java        2 Dec 2003 14:47:21 -0000       1.21
  @@ -60,7 +60,6 @@
   import java.net.MalformedURLException;
   import java.net.SocketException;
   import java.net.URL;
  -import java.net.URLDecoder;
   import java.util.ArrayList;
   import java.util.Arrays;
   import java.util.HashMap;
  @@ -1084,7 +1083,8 @@
               if (uri.charAt(0) == '/') {
                   uri = uri.substring(1);
               }
  -            env = getEnvironment(URLDecoder.decode(uri), request, res);
  +            // Pass uri into environment without URLDecoding, as it is 
already decoded.
  +            env = getEnvironment(uri, request, res);
           } catch (Exception e) {
               if (getLogger().isErrorEnabled()) {
                   getLogger().error("Problem with Cocoon servlet", e);