You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ma...@apache.org on 2017/12/04 21:20:01 UTC
[1/3] commons-dbcp git commit: Fix trailing whitespace
Repository: commons-dbcp
Updated Branches:
refs/heads/master 8a71764a8 -> 7b9fba0be
Fix trailing whitespace
Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/a27d7746
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/a27d7746
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/a27d7746
Branch: refs/heads/master
Commit: a27d7746e1d7ee7fe55276e57b9aaca33e4612a1
Parents: 8a71764
Author: Mark Thomas <ma...@apache.org>
Authored: Mon Dec 4 21:18:30 2017 +0000
Committer: Mark Thomas <ma...@apache.org>
Committed: Mon Dec 4 21:18:30 2017 +0000
----------------------------------------------------------------------
.../java/org/apache/commons/dbcp2/SwallowedExceptionLogger.java | 4 ++--
src/main/java/org/apache/commons/dbcp2/Utils.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/a27d7746/src/main/java/org/apache/commons/dbcp2/SwallowedExceptionLogger.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/dbcp2/SwallowedExceptionLogger.java b/src/main/java/org/apache/commons/dbcp2/SwallowedExceptionLogger.java
index 70a5a79..0c793d5 100644
--- a/src/main/java/org/apache/commons/dbcp2/SwallowedExceptionLogger.java
+++ b/src/main/java/org/apache/commons/dbcp2/SwallowedExceptionLogger.java
@@ -35,9 +35,9 @@ public class SwallowedExceptionLogger implements SwallowedExceptionListener{
* @param log logger
*/
public SwallowedExceptionLogger(final Log log) {
- this(log, true);
+ this(log, true);
}
-
+
/**
* Create a SwallowedExceptionLogger with the given logger and expired
* connection logging property.
http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/a27d7746/src/main/java/org/apache/commons/dbcp2/Utils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/dbcp2/Utils.java b/src/main/java/org/apache/commons/dbcp2/Utils.java
index 2ba10db..1ead9ca 100644
--- a/src/main/java/org/apache/commons/dbcp2/Utils.java
+++ b/src/main/java/org/apache/commons/dbcp2/Utils.java
@@ -40,7 +40,7 @@ public final class Utils {
/** Any SQL_STATE starting with this value is considered a fatal disconnect */
public static final String DISCONNECTION_SQL_CODE_PREFIX = "08";
-
+
/**
* SQL codes of fatal connection errors.
* <ul>
[3/3] commons-dbcp git commit: Fix Java 9 nag and ensure all possible
exceptions are handled
Posted by ma...@apache.org.
Fix Java 9 nag and ensure all possible exceptions are handled
Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/7b9fba0b
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/7b9fba0b
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/7b9fba0b
Branch: refs/heads/master
Commit: 7b9fba0be5f9ae7daf55d995b980646838f8975e
Parents: 91edebf
Author: Mark Thomas <ma...@apache.org>
Authored: Mon Dec 4 21:19:41 2017 +0000
Committer: Mark Thomas <ma...@apache.org>
Committed: Mon Dec 4 21:19:41 2017 +0000
----------------------------------------------------------------------
src/main/java/org/apache/commons/dbcp2/BasicDataSource.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/7b9fba0b/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java b/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
index 30dd42e..79db3b6 100644
--- a/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
+++ b/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
@@ -2164,7 +2164,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean
// Usage of DriverManager is not possible, as it does not
// respect the ContextClassLoader
// N.B. This cast may cause ClassCastException which is handled below
- driverToUse = (Driver) driverFromCCL.newInstance();
+ driverToUse = (Driver) driverFromCCL.getConstructor().newInstance();
if (!driverToUse.acceptsURL(url)) {
throw new SQLException("No suitable driver", "08001");
}
[2/3] commons-dbcp git commit: Remove unnecessary ;
Posted by ma...@apache.org.
Remove unnecessary ;
Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/91edebfe
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/91edebfe
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/91edebfe
Branch: refs/heads/master
Commit: 91edebfed2377e4d5d39335538a53f029c3ddc50
Parents: a27d774
Author: Mark Thomas <ma...@apache.org>
Authored: Mon Dec 4 21:19:09 2017 +0000
Committer: Mark Thomas <ma...@apache.org>
Committed: Mon Dec 4 21:19:09 2017 +0000
----------------------------------------------------------------------
.../java/org/apache/commons/dbcp2/PoolableConnectionFactory.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/91edebfe/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
index d89a526..6bc8666 100644
--- a/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
+++ b/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
@@ -321,7 +321,7 @@ public class PoolableConnectionFactory
throw new SQLException("initializeConnection: connection closed");
}
if(null != sqls) {
- try (Statement stmt = conn.createStatement();) {
+ try (Statement stmt = conn.createStatement()) {
for (final String sql : sqls) {
if (sql == null) {
throw new NullPointerException(