Revert fix see discussion in issue tracker

pull/388/head
Brett Wooldridge
parent 9613b63a43
commit 01a9a09778

@ -1,12 +1,27 @@
HikariCP Changes HikariCP Changes
* issue 379: stop closing idle connections, to keep minIdle connections in pool Changes in 2.4.1
* issue 380: housekeeper was not being scheduled in the case of a user specified
ScheduledExecutorService instance.
* issue 340: rollback change that elides setting the readonly property if the user
never explicitly configured it. See discussion in the Github issue tracker.
* issue 379: stop closing idle connections, to keep minimumIdle connections in pool
* issue 375: fixed InvalidPathException in HikariConfig * issue 375: fixed InvalidPathException in HikariConfig
* issue 362: fixed NullPointerException in closing connection (closing statements) * issue 362: fixed NullPointerException in closing connection (closing statements)
* issue 357: allow altering the username & password through JMX at runtime * issue 357: allow altering the username & password through JMX at runtime
* issue 349: handle integer Transaction isolation level * issue 349: handle integer Transaction isolation level
* Throw SQLTransientConnectionException instead of SQLTimeoutException * Throw SQLTransientConnectionException instead of SQLTimeoutException
* for validating connection, if network time out is set, do not set query timeout too * for validating connection, if network time out is set, do not set query timeout too
* ResultSet.getStatement() should return StatementProxy * ResultSet.getStatement() should return StatementProxy
Changes in 2.4.0 Changes in 2.4.0

@ -228,7 +228,8 @@
<Bundle-Name>HikariCP</Bundle-Name> <Bundle-Name>HikariCP</Bundle-Name>
<Export-Package> <Export-Package>
com.zaxxer.hikari, com.zaxxer.hikari,
com.zaxxer.hikari.hibernate com.zaxxer.hikari.hibernate,
com.zaxxer.hikari.metrics
</Export-Package> </Export-Package>
<Private-Package>com.zaxxer.hikari.*</Private-Package> <Private-Package>com.zaxxer.hikari.*</Private-Package>
<_exportcontents> <_exportcontents>

@ -79,7 +79,7 @@ public class HikariConfig implements HikariConfigMXBean
private String transactionIsolationName; private String transactionIsolationName;
private String username; private String username;
private boolean isAutoCommit; private boolean isAutoCommit;
private Boolean isReadOnly; private boolean isReadOnly;
private boolean isInitializationFailFast; private boolean isInitializationFailFast;
private boolean isIsolateInternalQueries; private boolean isIsolateInternalQueries;
private boolean isRegisterMbeans; private boolean isRegisterMbeans;
@ -548,12 +548,12 @@ public class HikariConfig implements HikariConfigMXBean
healthCheckProperties.setProperty(key, value); healthCheckProperties.setProperty(key, value);
} }
public Boolean isReadOnly() public boolean isReadOnly()
{ {
return isReadOnly; return isReadOnly;
} }
public void setReadOnly(Boolean readOnly) public void setReadOnly(boolean readOnly)
{ {
this.isReadOnly = readOnly; this.isReadOnly = readOnly;
} }

@ -45,7 +45,7 @@ public final class PoolElf
private final HikariConfig config; private final HikariConfig config;
private final String poolName; private final String poolName;
private final String catalog; private final String catalog;
private final Boolean isReadOnly; private final boolean isReadOnly;
private final boolean isAutoCommit; private final boolean isAutoCommit;
private final boolean isUseJdbc4Validation; private final boolean isUseJdbc4Validation;
private final boolean isIsolateInternalQueries; private final boolean isIsolateInternalQueries;
@ -181,9 +181,7 @@ public final class PoolElf
networkTimeout = getAndSetNetworkTimeout(connection, connectionTimeout); networkTimeout = getAndSetNetworkTimeout(connection, connectionTimeout);
connection.setAutoCommit(isAutoCommit); connection.setAutoCommit(isAutoCommit);
if (isReadOnly != null) { connection.setReadOnly(isReadOnly);
connection.setReadOnly(isReadOnly);
}
final int defaultLevel = connection.getTransactionIsolation(); final int defaultLevel = connection.getTransactionIsolation();
transactionIsolation = (transactionIsolation < 0 ? defaultLevel : transactionIsolation); transactionIsolation = (transactionIsolation < 0 ? defaultLevel : transactionIsolation);
@ -245,7 +243,7 @@ public final class PoolElf
{ {
int resetBits = 0; int resetBits = 0;
if (isReadOnly != null && poolEntry.isReadOnly != isReadOnly) { if (poolEntry.isReadOnly != isReadOnly) {
poolEntry.connection.setReadOnly(isReadOnly); poolEntry.connection.setReadOnly(isReadOnly);
resetBits |= 0b00001; resetBits |= 0b00001;
} }
@ -278,9 +276,7 @@ public final class PoolElf
void resetPoolEntry(final PoolBagEntry poolEntry) void resetPoolEntry(final PoolBagEntry poolEntry)
{ {
if (isReadOnly != null) { poolEntry.setReadOnly(isReadOnly);
poolEntry.setReadOnly(isReadOnly);
}
poolEntry.setCatalog(catalog); poolEntry.setCatalog(catalog);
poolEntry.setAutoCommit(isAutoCommit); poolEntry.setAutoCommit(isAutoCommit);
poolEntry.setNetworkTimeout(networkTimeout); poolEntry.setNetworkTimeout(networkTimeout);

@ -439,6 +439,7 @@ public class StubPreparedStatement extends StubStatement implements PreparedStat
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override
@SuppressWarnings("deprecation")
public void setUnicodeStream(int parameterIndex, InputStream x, int length) throws SQLException public void setUnicodeStream(int parameterIndex, InputStream x, int length) throws SQLException
{ {
} }

@ -141,6 +141,7 @@ public class StubResultSet implements ResultSet
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override
@SuppressWarnings("deprecation")
public BigDecimal getBigDecimal(int columnIndex, int scale) throws SQLException public BigDecimal getBigDecimal(int columnIndex, int scale) throws SQLException
{ {
return null; return null;
@ -183,6 +184,7 @@ public class StubResultSet implements ResultSet
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override
@SuppressWarnings("deprecation")
public InputStream getUnicodeStream(int columnIndex) throws SQLException public InputStream getUnicodeStream(int columnIndex) throws SQLException
{ {
return null; return null;
@ -253,6 +255,7 @@ public class StubResultSet implements ResultSet
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override
@SuppressWarnings("deprecation")
public BigDecimal getBigDecimal(String columnLabel, int scale) throws SQLException public BigDecimal getBigDecimal(String columnLabel, int scale) throws SQLException
{ {
return null; return null;
@ -295,6 +298,7 @@ public class StubResultSet implements ResultSet
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override
@SuppressWarnings("deprecation")
public InputStream getUnicodeStream(String columnLabel) throws SQLException public InputStream getUnicodeStream(String columnLabel) throws SQLException
{ {
return null; return null;

Loading…
Cancel
Save