*** ./interfaces/jdbc/org/postgresql/jdbc2/ResultSet.java.orig	Tue May 15 21:59:46 2001
--- ./interfaces/jdbc/org/postgresql/jdbc2/ResultSet.java	Tue May 15 22:06:43 2001
***************
*** 499,511 ****
        // could optimize this a tad to remove too many object creations...
        SimpleDateFormat df = null;
  
!       if (s.length()>23 && subsecond) {
          df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSzzzzzzzzz");
!       } else if (s.length()>23 && !subsecond) {
          df = new SimpleDateFormat("yyyy-MM-dd HH:mm:sszzzzzzzzz");
!       } else if (s.length()>10 && subsecond) {
          df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
!       } else if (s.length()>10 && !subsecond) {
          df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        } else {
          df = new SimpleDateFormat("yyyy-MM-dd");
--- 499,511 ----
        // could optimize this a tad to remove too many object creations...
        SimpleDateFormat df = null;
  
!       if (sbuf.length()>23 && subsecond) {
          df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSzzzzzzzzz");
!       } else if (sbuf.length()>23 && !subsecond) {
          df = new SimpleDateFormat("yyyy-MM-dd HH:mm:sszzzzzzzzz");
!       } else if (sbuf.length()>10 && subsecond) {
          df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
!       } else if (sbuf.length()>10 && !subsecond) {
          df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        } else {
          df = new SimpleDateFormat("yyyy-MM-dd");