*** ResultSet.java.old	Thu Sep  3 14:00:49 1998
--- ResultSet.java	Tue Oct 27 16:21:53 1998
***************
*** 448,463 ****
    public Timestamp getTimestamp(int columnIndex) throws SQLException
    {
      String s = getString(columnIndex);
!     SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:sszzz");
!     
      if (s != null)
        {
! 	int TZ = new Float(s.substring(19)).intValue();
! 	TZ = TZ * 60 * 60 * 1000;
! 	TimeZone zone = TimeZone.getDefault();
! 	zone.setRawOffset(TZ);
! 	String nm = zone.getID();
! 	s = s.substring(0,18) + nm;
  	try {
  	  java.util.Date d = df.parse(s);
  	  return new Timestamp(d.getTime());
--- 448,477 ----
    public Timestamp getTimestamp(int columnIndex) throws SQLException
    {
      String s = getString(columnIndex);
!     SimpleDateFormat df;
      if (s != null)
        {
! 	int i = 19;
! 	if (s.charAt(i) == '.')
! 	  {
! 	    i++;
! 	    while(Character.isDigit(s.charAt(i)))
! 	      i++;
! 	    df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSzzz");
! 	  }
! 	else
! 	  df = new SimpleDateFormat("yyyy-MM-dd HH:mm:sszzz");
! 
! 	int TZ = new Float(s.substring(i)).intValue();
! 	String sign;
! 	if (TZ < 0)
! 	  {
! 	    sign = "-";
! 	    TZ = -TZ;
! 	  }
! 	else
! 	  sign = "+";
! 	s = s.substring(0,i) + "GMT" + sign + TZ/10 + TZ%10 + ":00";
  	try {
  	  java.util.Date d = df.parse(s);
  	  return new Timestamp(d.getTime());