Author: ivaynberg
Date: Tue May 18 22:21:48 2010
New Revision: 945928
URL: http://svn.apache.org/viewvc?rev=945928&view=rev
Log:
WICKET-2861
Issue: WICKET-2861
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ListMultipleChoice.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ListMultipleChoice.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ListMultipleChoice.java?rev=945928&r1=945927&r2=945928&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ListMultipleChoice.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ListMultipleChoice.java
Tue May 18 22:21:48 2010
@@ -370,7 +370,11 @@ public class ListMultipleChoice<T> exten
modelChanging();
selectedValues.clear();
- selectedValues.addAll(getConvertedInput());
+ final Collection<T> converted = getConvertedInput();
+ if (converted != null)
+ {
+ selectedValues.addAll(converted);
+ }
modelChanged();
// call model.setObject()
try
