*** ResultSet.java.orig Fri May 12 16:54:22 2000
--- ResultSet.java      Tue Jun 13 16:46:21 2000
***************
*** 439,445 ****
      if(s==null)
        return null;
      
!     SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:sszzz");
      
      try {
        return new Timestamp(df.parse(s).getTime());
--- 439,447 ----
      if(s==null)
        return null;
      
!     SimpleDateFormat df = (s.charAt(19) == '.') ?
!                       new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSzzz") :
!                       new SimpleDateFormat("yyyy-MM-dd HH:mm:sszzz");
      
      try {
        return new Timestamp(df.parse(s).getTime());