You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2013/09/17 19:16:50 UTC
svn commit: r1524133 -
/ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/DateTimeConverters.java
Author: adrianc
Date: Tue Sep 17 17:16:50 2013
New Revision: 1524133
URL: http://svn.apache.org/r1524133
Log:
Small improvement to String-to-Date conversion: Accept either JDBC escape format or localized format.
Modified:
ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/DateTimeConverters.java
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/DateTimeConverters.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/DateTimeConverters.java?rev=1524133&r1=1524132&r2=1524133&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/DateTimeConverters.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/DateTimeConverters.java Tue Sep 17 17:16:50 2013
@@ -504,7 +504,7 @@ public class DateTimeConverters implemen
}
DateFormat df = null;
if (UtilValidate.isEmpty(formatString)) {
- df = UtilDateTime.toDateTimeFormat(UtilDateTime.DATE_TIME_FORMAT, timeZone, locale);
+ df = UtilDateTime.toDateTimeFormat(obj.contains("-") ? UtilDateTime.DATE_TIME_FORMAT : null, timeZone, locale);
} else {
df = UtilDateTime.toDateTimeFormat(formatString, timeZone, locale);
}