WFARQ-14 NPE in ServerSetupObserver.handleAfterUndeploy

wildfly · Nov 23, 2016 · b8c8c68 · b8c8c68
1 parent 21ae28b
commit b8c8c68
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/common/src/main/java/org/jboss/as/arquillian/container/ServerSetupObserver.java b/common/src/main/java/org/jboss/as/arquillian/container/ServerSetupObserver.java
@@ -152,7 +152,12 @@ public synchronized void handleAfterUndeploy(@Observes AfterUnDeploy afterDeploy
         if(deployed == null) {
             return;
         }
-        int count = deployed.get(container.getName());
+        Integer count = deployed.get(container.getName());
+        if (count == null) {
+            // The deployment was already undeployed or never deployed
+            // AfterUnDeploy and BeforeUnDeploy events are fired by arquillian-core regardless of deployment status
+            return;
+        }
         deployed.put(container.getName(), --count);
         if (count == 0 && afterClassRun) {
             for (int i = setupTasksInForce.size() - 1; i >= 0; i--) {