midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-1569 Import File Loader hiding unparseable date exception

This commit is contained in:
Carlos Ruiz 2013-11-25 18:17:27 -05:00
parent 3fe9471960
commit 59c7fc705f
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
org.adempiere.base/src/org/compiere/impexp/ImpFormatRow.java
View File

@ -24,10 +24,12 @@ import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.logging.Level; import java.util.logging.Level;
import org.adempiere.exceptions.AdempiereException;
import org.compiere.model.Callout; import org.compiere.model.Callout;
import org.compiere.model.X_AD_ImpFormat_Row; import org.compiere.model.X_AD_ImpFormat_Row;
import org.compiere.util.CLogger; import org.compiere.util.CLogger;
import org.compiere.util.Env; import org.compiere.util.Env;
import org.compiere.util.Util;
/** /**
* Import Format Row with parsing capability * Import Format Row with parsing capability
@ -390,7 +392,7 @@ public final class ImpFormatRow
/** /**
* Return date as YYYY-MM-DD HH24:MI:SS (JDBC Timestamp format w/o miliseconds) * Return date as YYYY-MM-DD HH24:MI:SS (JDBC Timestamp format w/o milliseconds)
* @param info data * @param info data
* @return date as JDBC format String * @return date as JDBC format String
*/ */
@ -400,6 +402,7 @@ public final class ImpFormatRow
{ {
try try
{ {
if (!Util.isEmpty(m_dataFormat))
m_dformat = new SimpleDateFormat(m_dataFormat); m_dformat = new SimpleDateFormat(m_dataFormat);
} }
catch (Exception e) catch (Exception e)
@ -418,13 +421,12 @@ public final class ImpFormatRow
} }
catch (ParseException pe) catch (ParseException pe)
{ {
log.log(Level.SEVERE, "ImpFormatRow.parseDate - " + info, pe); String msg = pe.getLocalizedMessage() + ": Pattern[" + m_dformat.toPattern() + "] Data[" + info + "]";
throw new AdempiereException(msg);
} }
if (ts == null)
ts = new Timestamp (System.currentTimeMillis());
// //
String dateString = ts.toString(); String dateString = ts.toString();
return dateString.substring(0, dateString.indexOf('.')); // cut off miliseconds return dateString.substring(0, dateString.indexOf('.')); // cut off milliseconds
} // parseNumber } // parseNumber
/** /**