← Back to branch summary

~maria-captains/mariadb-java-client/trunk

« back to all changes in this revision

Viewing changes to src/main/java/org/mariadb/jdbc/internal/common/AbstractValueObject.java

  • Committer: Massimo Siani
  • Date: 2014-03-26 16:19:30 UTC
  • mfrom: (502.1.1 timestamp-null)
  • Revision ID: massimo.siani@skysql.com-20140326161930-ijbxikqnbflihu0b
Merge from Massimo Siani: Return null for 'zero' timestamps

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/main/java/org/mariadb/jdbc/internal/common/AbstractValueObject.java
238
238
            return null;
239
239
        }
240
240
        String rawValue = getString();
 
241
        String zeroTimestamp = "0000-00-00 00:00:00";
 
242
        if (rawValue.equals(zeroTimestamp)) {
 
243
                return null;
 
244
        }
241
245
        if (rawValue.length() >= 4  &&  rawValue.charAt(4) != '-') {
242
246
           /* This is probably a time value, since year separator is missing */
243
247
           Time t = getTime(cal);