[teiid-commits] teiid SVN: r4647 - in branches/7.7.x: runtime/src/main/java/org/teiid/odbc and 1 other directory.
Author: jolee
Date: 2014-06-09 09:17:12 -0400 (Mon, 09 Jun 2014)
New Revision: 4647
Modified:
branches/7.7.x/build/kits/jboss-container/teiid-releasenotes.html
branches/7.7.x/runtime/src/main/java/org/teiid/odbc/ScriptReader.java
Log:
BZ1054940 - Roll up patch EDS_5.3.1_1_2014 + TEIID-2945 + TEIID-2952 + TEIID-2985 odbc
script reader does not handle extra statement delimiters
Modified: branches/7.7.x/build/kits/jboss-container/teiid-releasenotes.html
===================================================================
--- branches/7.7.x/build/kits/jboss-container/teiid-releasenotes.html 2014-05-29 01:51:50
UTC (rev 4646)
+++ branches/7.7.x/build/kits/jboss-container/teiid-releasenotes.html 2014-06-09 13:17:12
UTC (rev 4647)
@@ -260,6 +260,8 @@
</li>
<li>[<a
href='https://issues.jboss.org/browse/TEIID-2952'>TEIID-2952&l...>] -
Crypto exception with client/server running on different java versions
</li>
+<li>[<a
href='https://issues.jboss.org/browse/TEIID-2985'>TEIID-2985&l...>] - odbc
script reader does not handle extra statement delimiters
+</li>
</ul>
<h4>From 7.7.9</h4>
<ul>
Modified: branches/7.7.x/runtime/src/main/java/org/teiid/odbc/ScriptReader.java
===================================================================
--- branches/7.7.x/runtime/src/main/java/org/teiid/odbc/ScriptReader.java 2014-05-29
01:51:50 UTC (rev 4646)
+++ branches/7.7.x/runtime/src/main/java/org/teiid/odbc/ScriptReader.java 2014-06-09
13:17:12 UTC (rev 4647)
@@ -56,7 +56,13 @@
if (endOfFile) {
return null;
}
- return readStatementLoop();
+ while (true) {
+ String result = readStatementLoop();
+ if (result != null || endOfFile) {
+ return result;
+ }
+ }
+
}
private String readStatementLoop() throws IOException {