bodewig 2005/04/11 02:31:01
Modified: . WHATSNEW
src/main/org/apache/tools/ant/taskdefs SQLExec.java
Log:
merge fix for 27162
Revision Changes Path
1.803 +4 -2 ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.802
retrieving revision 1.803
diff -u -r1.802 -r1.803
--- WHATSNEW 8 Apr 2005 19:43:59 -0000 1.802
+++ WHATSNEW 11 Apr 2005 09:31:01 -0000 1.803
@@ -82,6 +82,10 @@
* The .NET compilation tasks failed if filenames given as references
contained spaces. Bugzilla Report 27170.
+* SQL task would try access result sets of statements that didn't
+ return any, causing problems with Informix IDS 9.2 and IBM DB2 8.1
+ FixPak 6 (or later). Bugzilla Reports 27162 and 29954.
+
Other changes:
--------------
@@ -513,8 +517,6 @@
* macrodef @@ escaping was broken. Bugzilla Report 27069.
-* SQL task did not work with Informix IDS 9.2. Bugzilla Report 27162.
-
* MacroDef did not allow attributes named 'description'. Bugzilla Report
27175.
* Throw build exception if name attribute missing from patternset#NameEntry.
1.71 +3 -2 ant/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
Index: SQLExec.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/SQLExec.java,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- SQLExec.java 14 Mar 2005 10:27:56 -0000 1.70
+++ SQLExec.java 11 Apr 2005 09:31:01 -0000 1.71
@@ -590,9 +590,10 @@
* @param rs the resultset to print information about
* @param out the place to print results
* @throws SQLException on SQL problems.
- * @since Ant 1.7
+ * @since Ant 1.6.3
*/
- protected void printResults(ResultSet rs, PrintStream out) throws
SQLException {
+ protected void printResults(ResultSet rs, PrintStream out)
+ throws SQLException {
if (rs != null) {
log("Processing new result set.", Project.MSG_VERBOSE);
ResultSetMetaData md = rs.getMetaData();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
