Make context data synchronized

src/main/java/io/vertx/core/impl/ContextImpl.java

@@ -27,6 +27,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executor;
 import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -39,7 +40,7 @@ public abstract class ContextImpl implements Context {
 
   private static final Logger log = LoggerFactory.getLogger(ContextImpl.class);
 
-  public final VertxInternal owner;
+  protected final VertxInternal owner;
   protected final String deploymentID;
   protected final JsonObject config;
   private Deployment deployment;
@@ -50,6 +51,7 @@ public abstract class ContextImpl implements Context {
   protected final Executor workerExec;
   protected VertxThread contextThread;
   private volatile boolean closeHooksRun;
+  private Map<String, Object> contextData;
 
   protected ContextImpl(VertxInternal vertx, Executor orderedInternalPoolExec, Executor workerExec, String deploymentID, JsonObject config,
                         ClassLoader tccl) {
@@ -151,8 +153,6 @@ public void runCloseHooks(Handler<AsyncResult<Void>> completionHandler) {
   @Override
   public abstract boolean isMultiThreadedWorkerContext();
 
-  public abstract Map<String, Object> contextData();
-
   @Override
   @SuppressWarnings("unchecked")
   public <T> T get(String key) {
@@ -247,6 +247,13 @@ public <T> void executeBlocking(Handler<Future<T>> blockingCodeHandler, Handler<
     executeBlocking(null, blockingCodeHandler, false, resultHandler);
   }
 
+  protected synchronized Map<String, Object> contextData() {
+    if (contextData == null) {
+      contextData = new ConcurrentHashMap<>();
+    }
+    return contextData;
+  }
+
   private <T> void executeBlocking(Action<T> action, Handler<Future<T>> blockingCodeHandler, boolean internal,
                                   Handler<AsyncResult<T>> resultHandler) {
     try {

src/main/java/io/vertx/core/impl/EventLoopContext.java

@@ -21,8 +21,6 @@
 import io.vertx.core.logging.Logger;
 import io.vertx.core.logging.impl.LoggerFactory;
 
-import java.util.HashMap;
-import java.util.Map;
 import java.util.concurrent.Executor;
 
 /**
@@ -60,16 +58,5 @@ protected void checkCorrectThread() {
       throw new IllegalStateException("Event delivered on unexpected thread " + current + " expected: " + contextThread);
     }
   }
-
-  private Map<String, Object> contextData;
-
-  @Override
-  public Map<String, Object> contextData() {
-    if (contextData == null) {
-      contextData = new HashMap<>();
-    }
-    return contextData;
-  }
-
-
+
 }

src/main/java/io/vertx/core/impl/WorkerContext.java

@@ -19,8 +19,6 @@
 import io.vertx.core.Handler;
 import io.vertx.core.json.JsonObject;
 
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executor;
 
 /**
@@ -53,24 +51,11 @@ protected void checkCorrectThread() {
     // NOOP
   }
 
-  private Map<String, Object> contextData;
-
-  @Override
-  public Map<String, Object> contextData() {
-    if (contextData == null) {
-      contextData = new ConcurrentHashMap<>();
-    }
-    return contextData;
-  }
-
   // In the case of a worker context, the IO will always be provided on an event loop thread, not a worker thread
   // so we need to execute it on the worker thread
   @Override
   public void executeFromIO(ContextTask task) {
     workerExec.execute(wrapTask(task, null, true));
   }
 
-
-
-
 }