Author: ivaynberg
Date: Tue May 18 22:20:27 2010
New Revision: 945926
URL: http://svn.apache.org/viewvc?rev=945926&view=rev
Log:
WICKET-2861: getConvertedInput() returns null and selectedValues.addAll tries
adding it
Issue: WICKET-2861
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=945926&r1=945925&r2=945926&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:20:27 2010
@@ -370,7 +370,10 @@ public class ListMultipleChoice<T> exten
modelChanging();
selectedValues.clear();
- selectedValues.addAll(getConvertedInput());
+ if (getConvertedInput() != null)
+ {
+ selectedValues.addAll(getConvertedInput());
+ }
modelChanged();
// call model.setObject()
try
