*** ./interfaces/jdbc/org/postgresql/jdbc2/PreparedStatement.java.orig	Sun Jun 24 21:05:29 2001
--- ./interfaces/jdbc/org/postgresql/jdbc2/PreparedStatement.java	Sun Jun 24 21:13:15 2001
***************
*** 65,78 ****
  		this.sql = sql;
  		this.connection = connection;
  	
- 		// might just as well create it here, so we don't take the hit later
- 
-             	SimpleDateFormat df = new SimpleDateFormat("''yyyy-MM-dd''");
-             	tl_df.set(df);
- 		
-             	df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-             	tl_tsdf.set(df);
-           
  		for (i = 0; i < sql.length(); ++i)
  		{
  			int c = sql.charAt(i);
--- 65,70 ----
***************
*** 95,111 ****
  			templateStrings[i] = (String)v.elementAt(i);
  	}
  
-         /**
-          * New in 7.1 - overides Statement.close() to dispose of a few local objects
-          */
-         public void close() throws SQLException
- 	 {
-           // free the ThreadLocal caches
-           tl_df.set(null);
- 	  tl_tsdf.set(null);
-           super.close();
-         }
- 
  	/**
  	 * A Prepared SQL query is executed and its ResultSet is returned
  	 *
--- 87,92 ----
***************
*** 343,348 ****
--- 324,333 ----
  	public void setDate(int parameterIndex, java.sql.Date x) throws SQLException
  	{
            SimpleDateFormat df = (SimpleDateFormat) tl_df.get();
+           if(df==null) {
+             df = new SimpleDateFormat("''yyyy-MM-dd''");
+             tl_df.set(df);
+           }
  
  	  set(parameterIndex, df.format(x));
  
***************
*** 382,387 ****
--- 367,376 ----
  	public void setTimestamp(int parameterIndex, Timestamp x) throws SQLException
          {
            SimpleDateFormat df = (SimpleDateFormat) tl_tsdf.get();
+           if(df==null) {
+             df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+             tl_tsdf.set(df);
+           }
            df.setTimeZone(TimeZone.getTimeZone("GMT"));
  
            // Use the shared StringBuffer