Author: rmannibucau
Date: Mon Aug 25 16:45:18 2014
New Revision: 1620370
URL: http://svn.apache.org/r1620370
Log:
TOMEE-1333 avoiding nasty NPE when BeforeUnDeploy even is unexpectedly sent,
patch from Karal Lassak
Modified:
tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/TestObserver.java
Modified:
tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/TestObserver.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/TestObserver.java?rev=1620370&r1=1620369&r2=1620370&view=diff
==============================================================================
---
tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/TestObserver.java
(original)
+++
tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/TestObserver.java
Mon Aug 25 16:45:18 2014
@@ -118,7 +118,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);