Author: ivaynberg Date: Tue May 18 22:22:05 2010 New Revision: 945929 URL: http://svn.apache.org/viewvc?rev=945929&view=rev Log: WICKET-2861: getConvertedInput() returns null and selectedValues.addAll tries adding it
Modified: wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/ListMultipleChoice.java Modified: wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/ListMultipleChoice.java URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/ListMultipleChoice.java?rev=945929&r1=945928&r2=945929&view=diff ============================================================================== --- wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/ListMultipleChoice.java (original) +++ wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/ListMultipleChoice.java Tue May 18 22:22:05 2010 @@ -370,9 +370,10 @@ public class ListMultipleChoice<T> exten modelChanging(); selectedValues.clear(); - if (getConvertedInput() != null) + final Collection<T> converted = getConvertedInput(); + if (converted != null) { - selectedValues.addAll(getConvertedInput()); + selectedValues.addAll(converted); } modelChanged(); // call model.setObject()