From b1552e24dfbd12eea55b277bad2db8b5bb2457a8 Mon Sep 17 00:00:00 2001 From: Kris Jurka Date: Tue, 22 Jun 2004 09:37:03 +0000 Subject: [PATCH] Close the existing socket connection when reverting to the V2 protocol, or encountering other connection failures. Laurent Sylvain --- .../jdbc1/AbstractJdbc1Connection.java | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java b/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java index ddee229d6e..19bd01aae5 100644 --- a/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java +++ b/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java @@ -208,11 +208,21 @@ public abstract class AbstractJdbc1Connection implements BaseConnection 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); + 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,6 +315,7 @@ public abstract class AbstractJdbc1Connection implements BaseConnection //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); -- 2.39.5