Repository: tomee Updated Branches: refs/heads/tomee-1.7.x c187bf686 -> 04421968a
TOMEE-1333 backporting ArquillianSuiteExtension workaround Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/04421968 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/04421968 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/04421968 Branch: refs/heads/tomee-1.7.x Commit: 04421968a792e806683cef931f46c9634eb8c489 Parents: c187bf6 Author: Romain Manni-Bucau <[email protected]> Authored: Wed Nov 12 08:57:40 2014 +0100 Committer: Romain Manni-Bucau <[email protected]> Committed: Wed Nov 12 08:57:40 2014 +0100 ---------------------------------------------------------------------- .../org/apache/openejb/arquillian/common/TestObserver.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/04421968/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/TestObserver.java ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/TestObserver.java b/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/TestObserver.java index 8ba5000..a580085 100644 --- a/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/TestObserver.java +++ b/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/TestObserver.java @@ -92,7 +92,12 @@ public class TestObserver { } private BeanContext beanContext() { - final String className = testClass.get().getName(); + final TestClass tc = testClass.get(); + if (tc == null) { + return null; + } + + final String className = tc.getName(); final ContainerSystem containerSystem = SystemInstance.get().getComponent(ContainerSystem.class); for (final AppContext app : containerSystem.getAppContexts()) { final BeanContext context = containerSystem.getBeanContext(app.getId() + "_" + className);
