svn commit: r493965 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DateTimePicker.java

[mrdon]

Author: mrdon
Date: Sun Jan  7 22:43:35 2007
New Revision: 493965

URL: http://svn.apache.org/viewvc?view=rev&rev=493965
Log:
Set default date parsing to the RFC 3399 standard
WW-1588

Modified:
    
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DateTimePicker.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DateTimePicker.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DateTimePicker.java?view=diff&rev=493965&r1=493964&r2=493965
==============================================================================
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DateTimePicker.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DateTimePicker.java
 Sun Jan  7 22:43:35 2007
@@ -297,11 +297,11 @@
                     SimpleDateFormat format = new SimpleDateFormat(
                             this.displayFormat);
                     date = format.parse(dateStr);
+                    return RFC3399_FORMAT.format(date);
                 } else {
-                    // last resource
-                    date = SimpleDateFormat.getInstance().parse(dateStr);
+                    // last resource to assume already in correct/default 
format
+                    return dateStr;
                 }
-                return RFC3399_FORMAT.format(date);
             } catch (ParseException e) {
                 LOG.error("Could not parse date", e);
                 return dateStr;