? built
? jdbcbuild.sh
Index: org/postgresql/jdbc1/AbstractJdbc1Connection.java
===================================================================
RCS file: /cvsroot/pgsql-server/src/interfaces/jdbc/org/postgresql/jdbc1/Attic/AbstractJdbc1Connection.java,v
retrieving revision 1.27.2.2
diff -c -r1.27.2.2 AbstractJdbc1Connection.java
*** org/postgresql/jdbc1/AbstractJdbc1Connection.java	10 Feb 2004 01:58:48 -0000	1.27.2.2
--- org/postgresql/jdbc1/AbstractJdbc1Connection.java	22 Jun 2004 09:23:37 -0000
***************
*** 208,218 ****
  			throw new PSQLException ("postgresql.con.failed", PSQLState.CONNECTION_UNABLE_TO_CONNECT, e);
  		}
  
! 	    //Now do the protocol work
! 		if (haveMinimumCompatibleVersion("7.4")) {
! 			openConnectionV3(host,port,info,database,url,d,password);
! 		} else {
! 			openConnectionV2(host,port,info,database,url,d,password);
  		}
  	  }
  
--- 208,228 ----
  			throw new PSQLException ("postgresql.con.failed", PSQLState.CONNECTION_UNABLE_TO_CONNECT, e);
  		}
  
! 		try {
! 			//Now do the protocol work
! 			if (haveMinimumCompatibleVersion("7.4")) {
! 				openConnectionV3(host,port,info,database,url,d,password);
! 			} else {
! 				openConnectionV2(host,port,info,database,url,d,password);
! 			}
! 		} catch (SQLException sqle) {
! 			// if we fail to completely establish a connection,
! 			// close down the socket to not leak resources.
! 			try {
! 				pgStream.close();
! 			} catch (IOException ioe) { }
! 
! 			throw sqle;
  		}
  	  }
  
***************
*** 305,310 ****
--- 315,321 ----
  							//if the error length is > than 30000 we assume this is really a v2 protocol 
  							//server so try again with a v2 connection
  							//need to create a new connection and try again
+ 							pgStream.close();
  							try
  							{
  								pgStream = new PGStream(p_host, p_port);