svn commit: r744182 - /wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java

[jdonnerstag]

Author: jdonnerstag
Date: Fri Feb 13 17:17:18 2009
New Revision: 744182

URL: http://svn.apache.org/viewvc?rev=744182&view=rev
Log:
fixed wicket-2083: NPE when clearing DateTimeField 

Modified:
    
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java

Modified: 
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java?rev=744182&r1=744181&r2=744182&view=diff
==============================================================================
--- 
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
 (original)
+++ 
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
 Fri Feb 13 17:17:18 2009
@@ -228,7 +228,15 @@
         */
        public void setDate(Date date)
        {
-               this.date = (date != null) ? new MutableDateTime(date) : null;
+               if (date == null) {
+                       this.date = null;
+                       setDefaultModelObject(null);
+                       setHours(null);
+                       setMinutes(null);
+                       return;
+               }
+               
+               this.date = new MutableDateTime(date);
                setDefaultModelObject(date);
 
                Integer hours = getHours();