not sure about those but some thread safe fields

Signed-off-by: Olivier Lamy <[email protected]>

Author: olamy

container/test-impl-base/src/main/java/org/jboss/arquillian/container/test/impl/client/ContainerEventController.java

@@ -43,6 +43,7 @@
 import org.jboss.arquillian.core.api.annotation.Inject;
 import org.jboss.arquillian.core.api.annotation.Observes;
 import org.jboss.arquillian.core.spi.EventContext;
+import org.jboss.arquillian.test.spi.annotation.TestScoped;
 import org.jboss.arquillian.test.spi.event.suite.AfterClass;
 import org.jboss.arquillian.test.spi.event.suite.AfterSuite;
 import org.jboss.arquillian.test.spi.event.suite.AfterTestLifecycleEvent;
@@ -68,7 +69,8 @@ public class ContainerEventController {
     private Instance<ContainerRegistry> containerRegistry;
 
     @Inject
-    private volatile Instance<DeploymentScenario> deploymentScenario;
+    @TestScoped
+    private Instance<DeploymentScenario> deploymentScenario;
 
     @Inject
     private Event<ContainerMultiControlEvent> container;
@@ -138,7 +140,6 @@ private void createContext(EventContext<? extends TestEvent> context) {
     * TODO: This should not rely on direct Reflection, but rather access the metadata through some
     * common metadata layer.
     */
-
     private void lookup(Method method, ResultCallback callback) {
         DeploymentTargetDescription deploymentTarget = locateDeployment(method);
 

core/impl-base/src/main/java/org/jboss/arquillian/core/impl/EventContextImpl.java

@@ -17,8 +17,9 @@
  */
 package org.jboss.arquillian.core.impl;
 
-import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
 import org.jboss.arquillian.core.spi.EventContext;
 import org.jboss.arquillian.core.spi.InvocationException;
 import org.jboss.arquillian.core.spi.NonManagedObserver;
@@ -32,8 +33,8 @@
  */
 public class EventContextImpl<T> implements EventContext<T> {
     private ManagerImpl manager;
-    private List<ObserverMethod> interceptors;
-    private List<ObserverMethod> observers;
+    private List<ObserverMethod> interceptors = new CopyOnWriteArrayList<>();
+    private List<ObserverMethod> observers = new CopyOnWriteArrayList<>();
     private NonManagedObserver<T> nonManagedObserver;
     private RuntimeLogger runtimeLogger;
 
@@ -70,8 +71,12 @@ public EventContextImpl(ManagerImpl manager, List<ObserverMethod> interceptors,
         Validate.notNull(runtimeLogger, "Runtime logger must be specified");
 
         this.manager = manager;
-        this.interceptors = interceptors == null ? new ArrayList<ObserverMethod>() : interceptors;
-        this.observers = observers == null ? new ArrayList<ObserverMethod>() : observers;
+        if(interceptors!=null) {
+            this.interceptors.addAll(interceptors);
+        }
+        if(observers!=null) {
+            this.observers.addAll(observers);
+        }
         this.nonManagedObserver = nonManagedObserver;
         this.event = event;
         this.runtimeLogger = runtimeLogger;