From b97b55eb105aaf0dbac5f99dd8aaa2104c00e561 Mon Sep 17 00:00:00 2001
From: Francois JACQUES <fjacques@murex.com>
Date: Tue, 25 Jun 2019 10:15:27 +0300
Subject: [PATCH] Fixes #3997 : Make SupplierFactoryBridge thread-safe.

Signed-off-by: Francois JACQUES <fjacques@murex.com>
---
 .../jersey/inject/hk2/SupplierFactoryBridge.java   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/inject/hk2/src/main/java/org/glassfish/jersey/inject/hk2/SupplierFactoryBridge.java b/inject/hk2/src/main/java/org/glassfish/jersey/inject/hk2/SupplierFactoryBridge.java
index b1950b109ef..10299238d75 100644
--- a/inject/hk2/src/main/java/org/glassfish/jersey/inject/hk2/SupplierFactoryBridge.java
+++ b/inject/hk2/src/main/java/org/glassfish/jersey/inject/hk2/SupplierFactoryBridge.java
@@ -18,6 +18,7 @@
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
+import java.util.Collections;
 import java.util.IdentityHashMap;
 import java.util.Map;
 import java.util.function.Supplier;
@@ -42,15 +43,15 @@
  */
 public class SupplierFactoryBridge<T> implements Factory<T> {
 
-    private ServiceLocator locator;
-    private ParameterizedType beanType;
-    private String beanName;
-    private boolean disposable;
+    private final ServiceLocator locator;
+    private final ParameterizedType beanType;
+    private final String beanName;
+    private final boolean disposable;
 
     // This bridge can create multiple instances using the method 'provide' therefore must map created suppliers because of
     // 'dispose' invocation later on.
     // TODO: Key as a WeakReference - prevent objects in scope which never dispose the objects such as PerLookup.
-    private Map<Object, DisposableSupplier<T>> disposableSuppliers = new IdentityHashMap<>();
+    private Map<Object, DisposableSupplier<T>> disposableSuppliers = Collections.synchronizedMap(new IdentityHashMap<>());
 
     /**
      * Constructor for a new bridge.
@@ -85,9 +86,8 @@ public T provide() {
     @Override
     public void dispose(T instance) {
         if (disposable) {
-            DisposableSupplier<T> disposableSupplier = disposableSuppliers.get(instance);
+            DisposableSupplier<T> disposableSupplier = disposableSuppliers.remove(instance);
             disposableSupplier.dispose(instance);
-            disposableSuppliers.remove(instance);
         }
     }
 }