From 4c0c9711e13db8ad72f86093461fee7a12451ee6 Mon Sep 17 00:00:00 2001 From: Brett Wooldridge Date: Wed, 12 Nov 2014 12:58:20 +0900 Subject: [PATCH] Fix #187 only set transaction isolation if it differs from the default. --- .../src/main/java/com/zaxxer/hikari/util/PoolUtilities.java | 4 +++- .../src/main/java/com/zaxxer/hikari/util/PoolUtilities.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/hikaricp-java6/src/main/java/com/zaxxer/hikari/util/PoolUtilities.java b/hikaricp-java6/src/main/java/com/zaxxer/hikari/util/PoolUtilities.java index 2208a83b..7a921559 100644 --- a/hikaricp-java6/src/main/java/com/zaxxer/hikari/util/PoolUtilities.java +++ b/hikaricp-java6/src/main/java/com/zaxxer/hikari/util/PoolUtilities.java @@ -195,8 +195,10 @@ public final class PoolUtilities public static void setupConnection(final Connection connection, final boolean isAutoCommit, final boolean isReadOnly, final int transactionIsolation, final String catalog) throws SQLException { connection.setAutoCommit(isAutoCommit); - connection.setTransactionIsolation(transactionIsolation); connection.setReadOnly(isReadOnly); + if (transactionIsolation != connection.getTransactionIsolation()) { + connection.setTransactionIsolation(transactionIsolation); + } if (catalog != null) { connection.setCatalog(catalog); } diff --git a/hikaricp/src/main/java/com/zaxxer/hikari/util/PoolUtilities.java b/hikaricp/src/main/java/com/zaxxer/hikari/util/PoolUtilities.java index 06f47ba9..4e4cfaff 100644 --- a/hikaricp/src/main/java/com/zaxxer/hikari/util/PoolUtilities.java +++ b/hikaricp/src/main/java/com/zaxxer/hikari/util/PoolUtilities.java @@ -177,8 +177,10 @@ public final class PoolUtilities public static void setupConnection(final Connection connection, final boolean isAutoCommit, final boolean isReadOnly, final int transactionIsolation, final String catalog) throws SQLException { connection.setAutoCommit(isAutoCommit); - connection.setTransactionIsolation(transactionIsolation); connection.setReadOnly(isReadOnly); + if (transactionIsolation != connection.getTransactionIsolation()) { + connection.setTransactionIsolation(transactionIsolation); + } if (catalog != null) { connection.setCatalog(catalog); }