cvs commit: jahia/core/src/java/org/jahia/params ParamBean.java

[Cedric Mailleux]

cmailleux    2005/09/27 16:42:16 CEST

  Modified files:
    core/src/java/org/jahia/params ParamBean.java 
  Log:
  Correct bug in case of no pathInfo available
  
  Revision  Changes    Path
  1.36      +4 -5      jahia/core/src/java/org/jahia/params/ParamBean.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/params/ParamBean.java.diff?r1=1.35&r2=1.36&f=h
  
  
  
  Index: ParamBean.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/params/ParamBean.java,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- ParamBean.java    27 Sep 2005 10:58:40 -0000      1.35
  +++ ParamBean.java    27 Sep 2005 14:42:16 -0000      1.36
  @@ -1408,12 +1408,11 @@
   
           // Parse the PathInfo and build a custom parameter map
           String pathInfo = request.getPathInfo();
  -        int indexOf = pathInfo.indexOf("&matrix");
  -        if(indexOf>0) {
  -            pathInfo = pathInfo.substring(0,indexOf);
  -        }
           if (pathInfo != null) {
  -
  +            int indexOf = pathInfo.indexOf("&matrix");
  +            if(indexOf>0) {
  +                pathInfo = pathInfo.substring(0,indexOf);
  +            }
               if (pathInfo.endsWith(".html")) {
                   // let's remove false static ending.
                   int lastSlash = pathInfo.lastIndexOf("/");