Repository: tomee Updated Branches: refs/heads/master 2e6ce35f8 -> d65c1d68c
NPE protection Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/d65c1d68 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/d65c1d68 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/d65c1d68 Branch: refs/heads/master Commit: d65c1d68ccf76afa5fac2e05ee79eb2a29538e54 Parents: 2e6ce35 Author: Romain manni-Bucau <[email protected]> Authored: Sat Mar 5 20:00:15 2016 +0100 Committer: Romain manni-Bucau <[email protected]> Committed: Sat Mar 5 20:00:15 2016 +0100 ---------------------------------------------------------------------- .../openejb/resource/jdbc/managed/local/ManagedConnection.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/d65c1d68/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 beaa9d3..7dca9c8 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 @@ -169,7 +169,7 @@ public class ManagedConnection implements InvocationHandler { } private Object unwrapIfNeeded(final Object arg) { - if (!Proxy.isProxyClass(arg.getClass())) { + if (arg == null || !Proxy.isProxyClass(arg.getClass())) { return arg; } final InvocationHandler handler = Proxy.getInvocationHandler(arg);
