Revert "PMD and checkstyle" This reverts commit 664a4d73b2f3876646ebec36623919325006fc9a.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/bdb9cf68 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/bdb9cf68 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/bdb9cf68 Branch: refs/heads/tomee-1.7.x Commit: bdb9cf68e6e6b3cc11d0d6d41f8f33e29d65aae9 Parents: be54eed Author: Jonathan Gallimore <[email protected]> Authored: Thu Jul 30 13:45:51 2015 +0100 Committer: Jonathan Gallimore <[email protected]> Committed: Thu Jul 30 13:45:51 2015 +0100 ---------------------------------------------------------------------- .../openejb/resource/jdbc/managed/local/ManagedConnection.java | 2 +- .../openejb/resource/jdbc/managed/local/ManagedDataSource.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/bdb9cf68/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedConnection.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedConnection.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedConnection.java index 859e445..3fc6d78 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedConnection.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedConnection.java @@ -273,7 +273,7 @@ public class ManagedConnection implements InvocationHandler { return false; } - final Key key = Key.class.cast(o); + Key key = Key.class.cast(o); return (ds == key.ds || ds.equals(key.ds)) && !(user != null ? !user.equals(key.user) : key.user != null) && !(pwd != null ? !pwd.equals(key.pwd) : key.pwd != null); http://git-wip-us.apache.org/repos/asf/tomee/blob/bdb9cf68/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedDataSource.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedDataSource.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedDataSource.java index 02bb881..82befc6 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedDataSource.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedDataSource.java @@ -17,10 +17,13 @@ package org.apache.openejb.resource.jdbc.managed.local; +import java.io.ObjectStreamException; import java.io.PrintWriter; import java.lang.reflect.Proxy; import java.sql.Connection; import java.sql.SQLException; +import java.sql.SQLFeatureNotSupportedException; +import java.util.logging.Logger; import javax.sql.CommonDataSource; import javax.sql.DataSource; import javax.transaction.TransactionManager;
