You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2015/07/30 22:59:05 UTC
tomee git commit: Checkstyle/PMD
Repository: tomee
Updated Branches:
refs/heads/tomee-1.7.x 553b0fd56 -> d18f1432a
Checkstyle/PMD
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/d18f1432
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/d18f1432
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/d18f1432
Branch: refs/heads/tomee-1.7.x
Commit: d18f1432a7021c2e5bd9b7085ca0b839f48b8d5d
Parents: 553b0fd
Author: Jonathan Gallimore <jo...@jrg.me.uk>
Authored: Thu Jul 30 21:58:41 2015 +0100
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Thu Jul 30 21:58:41 2015 +0100
----------------------------------------------------------------------
.../openejb/resource/jdbc/managed/local/ManagedConnection.java | 2 +-
.../openejb/resource/jdbc/managed/local/ManagedDataSource.java | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/d18f1432/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 fa6c7fe..1e2edfe 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
@@ -274,7 +274,7 @@ public class ManagedConnection implements InvocationHandler {
return false;
}
- Key key = Key.class.cast(o);
+ final 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/d18f1432/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 14dc99e..2ffd617 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,13 +17,10 @@
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;