Merge with 1.8.5. Compilation fix.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f223d3eb Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f223d3eb Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f223d3eb Branch: refs/heads/ignite-3477-master Commit: f223d3eb8122b06e762d82aaad6028bf35924ddb Parents: eff3185 Author: dkarachentsev <dkarachent...@gridgain.com> Authored: Mon Apr 3 13:40:19 2017 +0300 Committer: dkarachentsev <dkarachent...@gridgain.com> Committed: Mon Apr 3 13:40:19 2017 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/f223d3eb/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java index 45600bd..b999189 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java @@ -276,7 +276,7 @@ public class JdbcConnectionSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testTxAllowedCommit() throws Exception { - String url = CFG_URL_PREFIX + "transactionsAllowed=true@" + CFG_URL; + String url = CFG_URL_PREFIX + "transactionsAllowed=true@" + configURL(); try (final Connection conn = DriverManager.getConnection(url)) { conn.setTransactionIsolation(Connection.TRANSACTION_SERIALIZABLE); @@ -293,7 +293,7 @@ public class JdbcConnectionSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testTxAllowedRollback() throws Exception { - String url = CFG_URL_PREFIX + "transactionsAllowed=true@" + CFG_URL; + String url = CFG_URL_PREFIX + "transactionsAllowed=true@" + configURL(); try (final Connection conn = DriverManager.getConnection(url)) { conn.setTransactionIsolation(Connection.TRANSACTION_SERIALIZABLE);
