mirror of
https://github.com/apache/struts.git
synced 2026-08-07 15:46:57 +00:00
convert supplied value to list when isn't iterable
when user supply a not iterable value for list in ListUIBean, then convert it to a single member list (instead of a null value as before versions do)
This commit is contained in:
@@ -28,6 +28,7 @@ import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.lang.reflect.Array;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
@@ -86,10 +87,12 @@ public abstract class ListUIBean extends UIBean {
|
||||
value = list;
|
||||
}
|
||||
|
||||
if (value instanceof Iterable || !MakeIterator.isIterable(value)) {
|
||||
if (value instanceof Iterable) {
|
||||
addParameter("list", value);
|
||||
} else {
|
||||
} else if (MakeIterator.isIterable(value)) {
|
||||
addParameter("list", MakeIterator.convert(value));
|
||||
} else {
|
||||
addParameter("list", Collections.singletonList(value));
|
||||
}
|
||||
|
||||
if (value instanceof Collection) {
|
||||
|
||||
Reference in New Issue
Block a user