svn commit: r990008 - /wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java

[ivaynberg]

Author: ivaynberg
Date: Fri Aug 27 03:41:18 2010
New Revision: 990008

URL: http://svn.apache.org/viewvc?rev=990008&view=rev
Log:

Issue: WICKET-2905

Modified:
    
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java

Modified: 
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java
URL: 
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java?rev=990008&r1=990007&r2=990008&view=diff
==============================================================================
--- 
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java
 (original)
+++ 
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java
 Fri Aug 27 03:41:18 2010
@@ -219,13 +219,15 @@ public class Select extends FormComponen
                                                return true;
                                        }
                                }
+                return false;
                        }
                }
-               else
-               {
-                       Object selected = getDefaultModelObject();
-                       Object value = option.getDefaultModelObject();
 
+        return compareModels(getDefaultModelObject(), 
option.getDefaultModelObject());
+       }
+
+    private boolean compareModels(Object selected, Object value)
+    {
                        if (selected != null && selected instanceof Collection)
                        {
                                if (value instanceof Collection)
@@ -243,8 +245,4 @@ public class Select extends FormComponen
                        }
                }
 
-               return false;
-
-       }
-
 }