Commitff2f9b6

Dave Cramer

committed

fixed cancel query bug introduced by patch

1 parentb7cc409 commitff2f9b6Copy full SHA for ff2f9b6

File tree

+18

-12

lines changed

src/interfaces/jdbc/org/postgresql
- Connection.java
- core
  - QueryExecutor.java

+18

-12

lines changed

Lines changed: 1 addition & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`importorg.postgresql.core.*;`
`12`	`12`
`13`	`13`	`/*`
`14`		`- * $Id: Connection.java,v 1.41 2002/02/26 02:15:54 davec Exp $`
	`14`	`+ * $Id: Connection.java,v 1.42 2002/03/05 18:00:36 davec Exp $`
`15`	`15`	`*`
`16`	`16`	`* This abstract class is used by org.postgresql.Driver to open either the JDBC1 or`
`17`	`17`	`* JDBC2 versions of the Connection class.`
`@@ -315,16 +315,6 @@ protected void openConnection(String host, int port, Properties info, String dat`
`315`	`315`	`switch (beresp)`
`316`	`316`	`{`
`317`	`317`	`case'Z':`
`318`		`-`
`319`		`-try`
`320`		`- {`
`321`		`-pg_stream.SendChar('Q');`
`322`		`-pg_stream.SendChar(' ');`
`323`		`-pg_stream.SendChar(0);`
`324`		`-pg_stream.flush();`
`325`		`- }catch (IOExceptione) {`
`326`		`-thrownewPSQLException("postgresql.con.ioerror",e);`
`327`		`- }`
`328`	`318`	`break;`
`329`	`319`	`case'E':`
`330`	`320`	`case'N':`

Lines changed: 17 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`* <p>The lifetime of a QueryExecutor object is from sending the query`
`14`	`14`	`* until the response has been received from the backend.`
`15`	`15`	`*`
`16`		`- * $Id: QueryExecutor.java,v 1.6 2001/11/25 23:26:56 barry Exp $`
	`16`	`+ * $Id: QueryExecutor.java,v 1.7 2002/03/05 18:01:27 davec Exp $`
`17`	`17`	`*/`
`18`	`18`
`19`	`19`	`publicclassQueryExecutor`
`@@ -57,6 +57,7 @@ public java.sql.ResultSet execute() throws SQLException`
`57`	`57`
`58`	`58`	`intfqp =0;`
`59`	`59`	`booleanhfr =false;`
	`60`	`+intlastMessage =0;`
`60`	`61`
`61`	`62`	`synchronized (pg_stream)`
`62`	`63`	`{`
`@@ -112,11 +113,26 @@ public java.sql.ResultSet execute() throws SQLException`
`112`	`113`	`receiveFields();`
`113`	`114`	`break;`
`114`	`115`	`case'Z':// backend ready for query, ignore for now :-)`
	`116`	`+if (lastMessage =='Z' )`
	`117`	`+ {`
	`118`	`+try`
	`119`	`+ {`
	`120`	`+pg_stream.SendChar('Q');`
	`121`	`+pg_stream.SendChar(' ');`
	`122`	`+pg_stream.SendChar(0);`
	`123`	`+pg_stream.flush();`
	`124`	`+ }catch (IOExceptione) {`
	`125`	`+thrownewPSQLException("postgresql.con.ioerror",e);`
	`126`	`+ }`
	`127`	`+fqp++;`
	`128`	`+ }`
	`129`	`+`
`115`	`130`	`break;`
`116`	`131`	`default:`
`117`	`132`	`thrownewPSQLException("postgresql.con.type",`
`118`	`133`	`newCharacter((char)c));`
`119`	`134`	`}`
	`135`	`+lastMessage =c;`
`120`	`136`	`}`
`121`	`137`	`returnconnection.getResultSet(connection,statement,fields,tuples,status,update_count,insert_oid,binaryCursor);`
`122`	`138`	`}`

Comments

(0)