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

[Xavier Lawrence]

xlawrence    2005/08/09 15:24:18 CEST

  Modified files:
    core/src/java/org/jahia/params ParamBean.java 
  Log:
  removed unecessary checks
  
  Revision  Changes    Path
  1.27      +3 -8      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.26&r2=1.27&f=h
  
  
  
  Index: ParamBean.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/params/ParamBean.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- ParamBean.java    5 Aug 2005 13:58:19 -0000       1.26
  +++ ParamBean.java    9 Aug 2005 13:24:18 -0000       1.27
  @@ -2787,12 +2787,9 @@
           try {
               HttpSession session = this.getSession();
               if (session.getAttribute(OPERATION_MODE_PARAMETER) != null) {
  -                if (session.getAttribute(OPERATION_MODE_PARAMETER)instanceof
  -                    String) {
  -                    String oldOpMode = (String) session.getAttribute(
  +                String oldOpMode = (String) session.getAttribute(
                           OPERATION_MODE_PARAMETER);
  -                    newSiteURL.append(getOpModeURLPart(oldOpMode));
  -                }
  +                newSiteURL.append(getOpModeURLPart(oldOpMode));
               } else {
                   if (this.getOperationMode() != null) {
                           newSiteURL.append(getOpModeURLPart(this.
  @@ -3213,10 +3210,8 @@
   
           String oldOpMode = NORMAL;
           if (session.getAttribute(OPERATION_MODE_PARAMETER) != null) {
  -            if (session.getAttribute(OPERATION_MODE_PARAMETER)instanceof 
String) {
  -                oldOpMode = (String) session.getAttribute(
  +            oldOpMode = (String) session.getAttribute(
                       OPERATION_MODE_PARAMETER);
  -            }
           }
   
           // only store mode in session if we are not in administration