svn commit: r967012 - in /ofbiz/trunk/framework: base/src/org/ofbiz/base/util/UtilHttp.java webapp/src/org/ofbiz/webapp/event/ServiceMultiEventHandler.java

[erwan]

Author: erwan
Date: Fri Jul 23 09:27:59 2010
New Revision: 967012

URL: http://svn.apache.org/viewvc?rev=967012&view=rev
Log:
Manage compositeTypes in multi handler

Modified:
    ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilHttp.java
    ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceMultiEventHandler.java

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilHttp.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilHttp.java?rev=967012&r1=967011&r2=967012&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilHttp.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilHttp.java Fri Jul 23 09:27:59 2010
@@ -1312,6 +1312,9 @@ public class UtilHttp {
             int rowDelimiterIndex = (parameterName != null? parameterName.indexOf(UtilHttp.MULTI_ROW_DELIMITER): -1);
             if (rowDelimiterIndex > 0) {
                 String thisRowIndex = parameterName.substring(rowDelimiterIndex + rowDelimiterLength);
+                if (thisRowIndex.indexOf("_") > -1) {
+                    thisRowIndex = thisRowIndex.substring(0, thisRowIndex.indexOf("_"));
+                }
                 if (maxRowIndex.length() < thisRowIndex.length()) {
                     maxRowIndex = thisRowIndex;
                 } else if (maxRowIndex.length() == thisRowIndex.length() && maxRowIndex.compareTo(thisRowIndex) < 0) {

Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceMultiEventHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceMultiEventHandler.java?rev=967012&r1=967011&r2=967012&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceMultiEventHandler.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceMultiEventHandler.java Fri Jul 23 09:27:59 2010
@@ -261,6 +261,11 @@ public class ServiceMultiEventHandler im
                             }
                         }
 
+                        // make any composite parameter data (e.g., from a set of parameters {name_c_date, name_c_hour, name_c_minutes})
+                        if (value == null) {
+                            value = UtilHttp.makeParamValueFromComposite(request, paramName + curSuffix, locale);
+                        }
+
                         if (value == null) {
                             // still null, give up for this one
                             continue;