myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sc...@apache.org
Subject cvs commit: incubator-myfaces/src/components/org/apache/myfaces/custom/navmenu/jscookmenu HtmlJSCookMenuRenderer.java
Date Wed, 13 Apr 2005 13:52:01 GMT
schof       2005/04/13 06:52:01

  Modified:    src/components/org/apache/myfaces/custom/navmenu/jscookmenu
                        HtmlJSCookMenuRenderer.java
  Log:
  Fixes MYFACES-185 (patch submitted by Martin Bosak)
  
  Revision  Changes    Path
  1.15      +9 -2      incubator-myfaces/src/components/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlJSCookMenuRenderer.java
  
  Index: HtmlJSCookMenuRenderer.java
  ===================================================================
  RCS file: /home/cvs/incubator-myfaces/src/components/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlJSCookMenuRenderer.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- HtmlJSCookMenuRenderer.java	12 Apr 2005 17:47:51 -0000	1.14
  +++ HtmlJSCookMenuRenderer.java	13 Apr 2005 13:52:01 -0000	1.15
  @@ -41,6 +41,9 @@
    * @author Thomas Spiegl (latest modification by $Author$)
    * @version $Revision$ $Date$
    *          $Log$
  + *          Revision 1.15  2005/04/13 13:52:01  schof
  + *          Fixes MYFACES-185 (patch submitted by Martin Bosak)
  + *
    *          Revision 1.14  2005/04/12 17:47:51  schof
    *          Fixes MYFACES-182 (Thanks to David Heffelfinger for reporting and fixing.)
    *
  @@ -97,10 +100,14 @@
   
           Map parameter = context.getExternalContext().getRequestParameterMap();
           String actionParam = (String)parameter.get(JSCOOK_ACTION_PARAM);
  -        if (actionParam != null && !actionParam.trim().equals(""))
  +        if (actionParam != null && !actionParam.trim().equals("") && 
  +                !actionParam.trim().equals("null"))
           {
               String compId = component.getId();
               int idx = actionParam.indexOf(':');
  +            if (idx == -1) {
  +                return;
  +            }
               String actionId = actionParam.substring(0, idx);
               if (! compId.equals(actionId)) {
                   return;
  
  
  

Mime
View raw message