Repository: tomee Updated Branches: refs/heads/master 85ead5e47 -> d941fc186
avoid NPE Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/d941fc18 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/d941fc18 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/d941fc18 Branch: refs/heads/master Commit: d941fc186b1aad07a43bc6e3abb8170da0a2b972 Parents: 85ead5e Author: Romain Manni-Bucau <[email protected]> Authored: Fri Apr 24 19:08:55 2015 +0200 Committer: Romain Manni-Bucau <[email protected]> Committed: Fri Apr 24 19:08:55 2015 +0200 ---------------------------------------------------------------------- .../java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/d941fc18/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java b/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java index d4fe0c2..ed48b9e 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java @@ -328,7 +328,9 @@ public class ThreadSingletonServiceImpl implements ThreadSingletonService { logger.debug("Clearing:'" + ctx + "'"); } contextByClassLoader.remove(key); - ctx.clear(); + if (ctx != null) { + ctx.clear(); + } } @Override
