[2/2] struts git commit: Converts value of single parameter

2016-07-31 Thread lukaszlenart 
Converts value of single parameter


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/8b559afc
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/8b559afc
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/8b559afc

Branch: refs/heads/master
Commit: 8b559afc7604a2b80ed222987e87ef46264f3c5f
Parents: 0b24437
Author: Lukasz Lenart 
Authored: Sun Jul 31 13:39:37 2016 +0200
Committer: Lukasz Lenart 
Committed: Sun Jul 31 13:39:37 2016 +0200

--
 .../xwork2/conversion/impl/CollectionConverter.java   | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/8b559afc/core/src/main/java/com/opensymphony/xwork2/conversion/impl/CollectionConverter.java
--
diff --git 
a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/CollectionConverter.java
 
b/core/src/main/java/com/opensymphony/xwork2/conversion/impl/CollectionConverter.java
index dfe4030..df7cf8c 100644
--- 
a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/CollectionConverter.java
+++ 
b/core/src/main/java/com/opensymphony/xwork2/conversion/impl/CollectionConverter.java
@@ -61,11 +61,14 @@ public class CollectionConverter extends 
DefaultTypeConverter {
 }
 } else {
 result = createCollection(toType, memberType, -1);
-result.add(value);
+TypeConverter converter = getTypeConverter(context);
+Object convertedValue = converter.convertValue(context, target, 
member, propertyName, value, memberType);
+if (!TypeConverter.NO_CONVERSION_POSSIBLE.equals(convertedValue)) {
+result.add(convertedValue);
+}
 }
 
 return result;
-
 }
 
 private Collection createCollection(Class toType, Class memberType, int 
size) {

[1/2] struts git commit: Fixes issue with posting multiple values

2016-07-31 Thread lukaszlenart 
Repository: struts
Updated Branches:
  refs/heads/master 5acc71f7c -> 8b559afc7


Fixes issue with posting multiple values


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/0b24437e
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/0b24437e
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/0b24437e

Branch: refs/heads/master
Commit: 0b24437ed6fb8bf4b655a680a42eb4fd41cdd66c
Parents: 5acc71f
Author: Lukasz Lenart 
Authored: Sun Jul 31 13:39:22 2016 +0200
Committer: Lukasz Lenart 
Committed: Sun Jul 31 13:39:22 2016 +0200

--
 .../opensymphony/xwork2/interceptor/ParametersInterceptor.java | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/0b24437e/core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
--
diff --git 
a/core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
 
b/core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
index 80aa363..07bb9df 100644
--- 
a/core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
+++ 
b/core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
@@ -203,7 +203,11 @@ public class ParametersInterceptor extends 
MethodFilterInterceptor {
 String name = entry.getKey();
 Parameter value = entry.getValue();
 try {
-newStack.setParameter(name, value.getValue());
+if (value.isMultiple()) {
+newStack.setParameter(name, value.getMultipleValues());
+} else {
+newStack.setParameter(name, value.getValue());
+}
 } catch (RuntimeException e) {
 if (devMode) {
 notifyDeveloperParameterException(action, name, 
e.getMessage());