Repository: commons-dbcp Updated Branches: refs/heads/master 1704222c0 -> 71a4e3f5b
Format nits. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/71a4e3f5 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/71a4e3f5 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/71a4e3f5 Branch: refs/heads/master Commit: 71a4e3f5bad9e17e7213368de6af803bc3cfc160 Parents: 1704222 Author: Gary Gregory <garydgreg...@gmail.com> Authored: Fri Jun 8 17:15:16 2018 -0600 Committer: Gary Gregory <garydgreg...@gmail.com> Committed: Fri Jun 8 17:15:16 2018 -0600 ---------------------------------------------------------------------- .../commons/dbcp2/PoolableCallableStatement.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/71a4e3f5/src/main/java/org/apache/commons/dbcp2/PoolableCallableStatement.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/PoolableCallableStatement.java b/src/main/java/org/apache/commons/dbcp2/PoolableCallableStatement.java index 416082f..e1e4e1d 100644 --- a/src/main/java/org/apache/commons/dbcp2/PoolableCallableStatement.java +++ b/src/main/java/org/apache/commons/dbcp2/PoolableCallableStatement.java @@ -63,7 +63,7 @@ public class PoolableCallableStatement extends DelegatingCallableStatement { // Remove from trace now because this statement will be // added by the activate method. - if(getConnectionInternal() != null) { + if (getConnectionInternal() != null) { getConnectionInternal().removeTrace(this); } } @@ -76,12 +76,12 @@ public class PoolableCallableStatement extends DelegatingCallableStatement { // calling close twice should have no effect if (!isClosed()) { try { - _pool.returnObject(_key,this); - } catch(final SQLException e) { + _pool.returnObject(_key, this); + } catch (final SQLException e) { throw e; - } catch(final RuntimeException e) { + } catch (final RuntimeException e) { throw e; - } catch(final Exception e) { + } catch (final Exception e) { throw new SQLException("Cannot close CallableStatement (return to pool failed)", e); } } @@ -94,8 +94,8 @@ public class PoolableCallableStatement extends DelegatingCallableStatement { @Override protected void activate() throws SQLException { setClosedInternal(false); - if( getConnectionInternal() != null ) { - getConnectionInternal().addTrace( this ); + if (getConnectionInternal() != null) { + getConnectionInternal().addTrace(this); } super.activate(); } @@ -107,7 +107,7 @@ public class PoolableCallableStatement extends DelegatingCallableStatement { @Override protected void passivate() throws SQLException { setClosedInternal(true); - if( getConnectionInternal() != null ) { + if (getConnectionInternal() != null) { getConnectionInternal().removeTrace(this); } @@ -116,7 +116,7 @@ public class PoolableCallableStatement extends DelegatingCallableStatement { // FIXME The PreparedStatement we're wrapping should handle this for us. // See DBCP-10 for what could happen when ResultSets are closed twice. final List<AbandonedTrace> resultSets = getTrace(); - if(resultSets != null) { + if (resultSets != null) { final ResultSet[] set = resultSets.toArray(new ResultSet[resultSets.size()]); for (final ResultSet element : set) { element.close();
