Updated Branches: refs/heads/master 674a95a16 -> b2dc52d6f refs/heads/wicket-1.4.x ebec622ce -> 8a43cb3f8 refs/heads/wicket-1.5.x cb325505b -> 9546a36d9
Wicket-2949 use raw input Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/b2dc52d6 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/b2dc52d6 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/b2dc52d6 Branch: refs/heads/master Commit: b2dc52d6f522ad9c9aabcd6f25c1242f5071bc25 Parents: 674a95a Author: Sven Meier <[email protected]> Authored: Fri Jan 27 17:17:04 2012 +0100 Committer: Sven Meier <[email protected]> Committed: Fri Jan 27 17:17:04 2012 +0100 ---------------------------------------------------------------------- .../org/apache/wicket/markup/html/form/Check.java | 3 ++- .../extensions/markup/html/form/select/Select.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/b2dc52d6/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Check.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Check.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Check.java index a40a516..02c1906 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Check.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Check.java @@ -176,7 +176,8 @@ public class Check<T> extends LabeledWebMarkupContainer if (group.hasRawInput()) { - final String[] inputArray = group.getInputAsArray(); + // Wicket-2949 getInputAsArray() might not be the raw input + final String[] inputArray = group.getRawInput().split(FormComponent.VALUE_SEPARATOR); if (inputArray != null) { http://git-wip-us.apache.org/repos/asf/wicket/blob/b2dc52d6/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java index 8284d59..75ba0bf 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java @@ -223,7 +223,8 @@ public class Select<T> extends FormComponent<T> // if the raw input is specified use that, otherwise use model if (hasRawInput()) { - String[] values = getInputAsArray(); + // Wicket-2949 getInputAsArray() might not be the raw input + String[] values = getRawInput().split(VALUE_SEPARATOR); if (values != null && values.length > 0) { for (int i = 0; i < values.length; i++)
