[jboss-cvs] jboss-portal/wsrp/src/main/org/jboss/portal/wsrp/consumer ...

[Julien Viet]

  User: julien  
  Date: 06/07/30 20:05:41

  Modified:    wsrp/src/main/org/jboss/portal/wsrp/consumer 
                        ActionHandler.java
  Log:
  - Make Parameters extend ParameterMap
  
  Revision  Changes    Path
  1.3       +10 -14    jboss-portal/wsrp/src/main/org/jboss/portal/wsrp/consumer/ActionHandler.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ActionHandler.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/wsrp/src/main/org/jboss/portal/wsrp/consumer/ActionHandler.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- ActionHandler.java	10 Jun 2006 18:36:15 -0000	1.2
  +++ ActionHandler.java	31 Jul 2006 00:05:41 -0000	1.3
  @@ -52,7 +52,7 @@
   
   /**
    * @author <a href="mailto:chris.laprun at jboss.com">Chris Laprun</a>
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    * @since 2.4 (May 31, 2006)
    */
   public class ActionHandler extends InvocationHandler
  @@ -92,13 +92,10 @@
   
         // form parameters
         Parameters params = actionContext.getForm();
  -      if (params != null)
  +      if (params != null && !params.isEmpty())
         {
  -         Map paramMap = params.getMap();
  -         if (!paramMap.isEmpty())
  -         {
  -            List formParameters = new ArrayList(paramMap.size());
  -            for (Iterator paramEntries = paramMap.entrySet().iterator(); paramEntries.hasNext();)
  +         List formParameters = new ArrayList(params.size());
  +         for (Iterator paramEntries = params.entrySet().iterator(); paramEntries.hasNext();)
               {
                  Map.Entry param = (Map.Entry)paramEntries.next();
                  String name = (String)param.getKey();
  @@ -110,7 +107,6 @@
               }
               interactionParams.setFormParameters((NamedString[])formParameters.toArray(new NamedString[0]));
            }
  -      }
   
         // todo: need to deal with GET method in forms