Applied Kris Jurkas patch to fix rollback and SQLException

Dave Cramer · Dave Cramer · commit 985e551b4866 · 2003-02-04T11:01:52.000Z
diff --git a/src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java b/src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
@@ -16,7 +16,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.18 2003/02/04 09:20:08 barry Exp $
+ * $Id: QueryExecutor.java,v 1.19 2003/02/04 11:01:52 davec Exp $
  */
 
 public class QueryExecutor
@@ -189,14 +189,16 @@ private java.sql.ResultSet execute() throws SQLException
 	 */
 	private void sendQuery() throws SQLException
 	{
+		for ( int i = 0; i < m_binds.length ; i++ )
+		{
+			if ( m_binds[i] == null )
+				throw new PSQLException("postgresql.prep.param", new Integer(i + 1));
+		}
 		try
 		{
 			pg_stream.SendChar('Q');
 			for (int i = 0 ; i < m_binds.length ; ++i)
 			{
-				if (m_binds[i] == null)
-					throw new PSQLException("postgresql.prep.param (" + i + ")", new Integer(i + 1));
-
 				pg_stream.Send(connection.getEncoding().encode(m_sqlFrags[i]));
 				pg_stream.Send(connection.getEncoding().encode(m_binds[i].toString()));
 			}

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`* <p>The lifetime of a QueryExecutor object is from sending the query`
`17`	`17`	`* until the response has been received from the backend.`
`18`	`18`	`*`
`19`		`- * $Id: QueryExecutor.java,v 1.18 2003/02/04 09:20:08 barry Exp $`
	`19`	`+ * $Id: QueryExecutor.java,v 1.19 2003/02/04 11:01:52 davec Exp $`
`20`	`20`	`*/`
`21`	`21`
`22`	`22`	`public class QueryExecutor`
`@@ -189,14 +189,16 @@ private java.sql.ResultSet execute() throws SQLException`
`189`	`189`	`*/`
`190`	`190`	`private void sendQuery() throws SQLException`
`191`	`191`	`{`
	`192`	`+ for ( int i = 0; i < m_binds.length ; i++ )`
	`193`	`+ {`
	`194`	`+ if ( m_binds[i] == null )`
	`195`	`+ throw new PSQLException("postgresql.prep.param", new Integer(i + 1));`
	`196`	`+ }`
`192`	`197`	`try`
`193`	`198`	`{`
`194`	`199`	`pg_stream.SendChar('Q');`
`195`	`200`	`for (int i = 0 ; i < m_binds.length ; ++i)`
`196`	`201`	`{`
`197`		`- if (m_binds[i] == null)`
`198`		`- throw new PSQLException("postgresql.prep.param (" + i + ")", new Integer(i + 1));`
`199`		`-`
`200`	`202`	`pg_stream.Send(connection.getEncoding().encode(m_sqlFrags[i]));`
`201`	`203`	`pg_stream.Send(connection.getEncoding().encode(m_binds[i].toString()));`
`202`	`204`	`}`