fixed cancel query bug introduced by patch

Dave Cramer · Dave Cramer · commit ff2f9b663f73 · 2002-03-05T18:01:27.000Z
diff --git a/src/interfaces/jdbc/org/postgresql/Connection.java b/src/interfaces/jdbc/org/postgresql/Connection.java
@@ -11,7 +11,7 @@
 import org.postgresql.core.*;
 
 /*
- * $Id: Connection.java,v 1.41 2002/02/26 02:15:54 davec Exp $
+ * $Id: Connection.java,v 1.42 2002/03/05 18:00:36 davec Exp $
  *
  * This abstract class is used by org.postgresql.Driver to open either the JDBC1 or
  * JDBC2 versions of the Connection class.
@@ -315,16 +315,6 @@ protected void openConnection(String host, int port, Properties info, String dat
 		switch (beresp)
 		{
 			case 'Z':
-
-                              try
-                                 {
-                                    pg_stream.SendChar('Q');
-                                    pg_stream.SendChar(' ');
-                                    pg_stream.SendChar(0);
-                                    pg_stream.flush();
-                                 } catch (IOException e) {
-                                    throw new PSQLException("postgresql.con.ioerror",e);
-                                 }
 				break;
 			case 'E':
 			case 'N':
diff --git a/src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java b/src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
@@ -13,7 +13,7 @@
  * <p>The lifetime of a QueryExecutor object is from sending the query
  * until the response has been received from the backend.
  *
- * $Id: QueryExecutor.java,v 1.6 2001/11/25 23:26:56 barry Exp $
+ * $Id: QueryExecutor.java,v 1.7 2002/03/05 18:01:27 davec Exp $
  */
 
 public class QueryExecutor
@@ -57,6 +57,7 @@ public java.sql.ResultSet execute() throws SQLException
 
 		int fqp = 0;
 		boolean hfr = false;
+		int lastMessage = 0;
 
 		synchronized (pg_stream)
 		{
@@ -112,11 +113,26 @@ public java.sql.ResultSet execute() throws SQLException
 						receiveFields();
 						break;
 					case 'Z':		 // backend ready for query, ignore for now :-)
+						if ( lastMessage == 'Z' )
+ 			                        {
+						     try
+                        			     {
+                                    			pg_stream.SendChar('Q');
+                                    			pg_stream.SendChar(' ');
+                                    			pg_stream.SendChar(0);
+                                    			pg_stream.flush();
+                                 		     } catch (IOException e) {
+                                    			throw new PSQLException("postgresql.con.ioerror",e);
+                                 		     }
+                              			     fqp++;
+                           			}
+ 					
 						break;
 					default:
 						throw new PSQLException("postgresql.con.type",
 												new Character((char) c));
 				}
+				lastMessage = c;
 			}
 			return connection.getResultSet(connection, statement, fields, tuples, status, update_count, insert_oid, binaryCursor);
 		}
