This patch merges the identical methods from the JDBC1 and JDBC2

connection implementations (org.postgresql.jdbc[1|2].Connection) into
their superclass (org.postgresql.Connection).

It also changes the close() methods of Connection and PG_Stream, so that
PG_Stream no longer is responsible for sending the termination packet 'X'
to the backend. I figured that protocol-level stuff like that belonged in
Connection more than in PG_Stream.

Anders Bengtsson

1 files changed, 1 insertions, 3 deletions

diff --git a/src/interfaces/jdbc/org/postgresql/PG_Stream.java b/src/interfaces/jdbc/org/postgresql/PG_Stream.java
index 999ef174be..3a6eaebc01 100644
--- a/src/interfaces/jdbc/org/postgresql/PG_Stream.java
+++ b/src/interfaces/jdbc/org/postgresql/PG_Stream.java
@@ -10,7 +10,7 @@ import org.postgresql.core.*;
 import org.postgresql.util.*;
 
 /**
- * $Id: PG_Stream.java,v 1.10 2001/07/21 18:52:10 momjian Exp $
+ * $Id: PG_Stream.java,v 1.11 2001/07/30 14:51:19 momjian Exp $
  *
  * This class is used by Connection & PGlobj for communicating with the
  * backend.
@@ -346,8 +346,6 @@ public class PG_Stream
    */
   public void close() throws IOException
   {
-    pg_output.write("X".getBytes());
-    pg_output.flush();
     pg_output.close();
     pg_input.close();
     connection.close();