From teiid-commits at lists.jboss.org Mon Jun  9 09:17:13 2014
Content-Type: multipart/mixed; boundary="===============7291620673305451764=="
MIME-Version: 1.0
From: teiid-commits at lists.jboss.org
To: teiid-commits at lists.jboss.org
Subject: [teiid-commits] teiid SVN: r4647 - in branches/7.7.x:
 runtime/src/main/java/org/teiid/odbc and 1 other directory.
Date: Mon, 09 Jun 2014 09:17:13 -0400
Message-ID: <201406091317.s59DHDux019626@svn01.web.mwc.hst.phx2.redhat.com>

--===============7291620673305451764==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

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 + TEII=
D-2985 odbc script reader does not handle extra statement delimiters

Modified: branches/7.7.x/build/kits/jboss-container/teiid-releasenotes.html
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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=3D'https://issues.jboss.org/browse/TEIID-2952'>TEIID-2952</a>=
] - Crypto exception with client/server running on different java versions
 </li>
+<li>[<a href=3D'https://issues.jboss.org/browse/TEIID-2985'>TEIID-2985</a>=
] - 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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/7.7.x/runtime/src/main/java/org/teiid/odbc/ScriptReader.java	2=
014-05-29 01:51:50 UTC (rev 4646)
+++ branches/7.7.x/runtime/src/main/java/org/teiid/odbc/ScriptReader.java	2=
014-06-09 13:17:12 UTC (rev 4647)
@@ -56,7 +56,13 @@
         if (endOfFile) {
             return null;
         }
-        return readStatementLoop();
+        while (true) {
+        	String result =3D readStatementLoop();
+        	if (result !=3D null || endOfFile) {
+        		return result;
+        	}
+        }
+        =

     }
 =

     private String readStatementLoop() throws IOException {


--===============7291620673305451764==--