Author: jolee
Date: 2014-06-25 12:13:24 -0400 (Wed, 25 Jun 2014)
New Revision: 4648
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:
Revert "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"
This reverts commit bae43cf42f1820f0af823d44d6b03dfc72c9ffc6.
Modified: branches/7.7.x/build/kits/jboss-container/teiid-releasenotes.html
===================================================================
--- branches/7.7.x/build/kits/jboss-container/teiid-releasenotes.html 2014-06-09 13:17:12
UTC (rev 4647)
+++ branches/7.7.x/build/kits/jboss-container/teiid-releasenotes.html 2014-06-25 16:13:24
UTC (rev 4648)
@@ -260,8 +260,6 @@
</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-06-09
13:17:12 UTC (rev 4647)
+++ branches/7.7.x/runtime/src/main/java/org/teiid/odbc/ScriptReader.java 2014-06-25
16:13:24 UTC (rev 4648)
@@ -56,13 +56,7 @@
if (endOfFile) {
return null;
}
- while (true) {
- String result = readStatementLoop();
- if (result != null || endOfFile) {
- return result;
- }
- }
-
+ return readStatementLoop();
}
private String readStatementLoop() throws IOException {