Revision 44759 trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.lib/org.gvsig.expressionevaluator.lib.impl/src/main/java/org/gvsig/expressionevaluator/impl/function/date/TimestampFunction.java

View differences:

TimestampFunction.java
30 30 
    public Object call(Interpreter interpreter, Object[] args) {
31 31 
        Object date_obj = getObject(args, 0);
32 32 
        if( date_obj instanceof Date ) {
33 
            return date_obj;
33 
            return new java.sql.Timestamp(((Date) date_obj).getTime());
34 34 
        }
35 35 
        String date = getStr(args, 0);
36 36 
        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
37 37 
        try {
38 
            Date x = df.parse(date);
38 
            java.sql.Timestamp x = java.sql.Timestamp.valueOf(date);
39 39 
            return x;
40 
        } catch (ParseException ex) {
40 
        } catch (Exception ex) {
41 41 
            throw new RuntimeException("Can't parse timestamp value '"+date+"' expected format 'yyyy-MM-dd HH:mm:ss'.", ex);
42 42 
        }
43 43

Also available in: Unified diff