You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2014/10/21 00:52:23 UTC
git commit: #TOMEE-1422 - Potential NP
Repository: tomee
Updated Branches:
refs/heads/develop eef77fb71 -> a2a4d9247
#TOMEE-1422 - Potential NP
Thanks to Daniel Cunha
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/a2a4d924
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/a2a4d924
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/a2a4d924
Branch: refs/heads/develop
Commit: a2a4d92475e8ed7fcd5f8f99a7630b3cccb3668b
Parents: eef77fb
Author: AndyGee <an...@gmx.de>
Authored: Tue Oct 21 00:51:58 2014 +0200
Committer: AndyGee <an...@gmx.de>
Committed: Tue Oct 21 00:52:13 2014 +0200
----------------------------------------------------------------------
.../openejb/arquillian/openejb/OpenEJBDeployableContainer.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/a2a4d924/arquillian/arquillian-openejb-embedded-5/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBDeployableContainer.java
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-openejb-embedded-5/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBDeployableContainer.java b/arquillian/arquillian-openejb-embedded-5/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBDeployableContainer.java
index 00d1125..f73135a 100644
--- a/arquillian/arquillian-openejb-embedded-5/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBDeployableContainer.java
+++ b/arquillian/arquillian-openejb-embedded-5/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBDeployableContainer.java
@@ -275,7 +275,10 @@ public class OpenEJBDeployableContainer implements DeployableContainer<OpenEJBCo
if (initialContext != null) {
initialContext.close();
}
- SystemInstance.get().getComponent(Closeables.class).close();
+ Closeables closeables = SystemInstance.get().getComponent(Closeables.class);
+ if (closeables != null) {
+ closeables.close();
+ }
} catch (final NamingException e) {
throw new LifecycleException("can't close the OpenEJB container", e);
} catch (final IOException e) {