[WW-5121] Fix: remove contention during Scope.SINGLETON injection

2026-08-06 07:06:58 +00:00 · 2021-03-22 09:40:02 +01:00
parent 39d70e3944
commit ce8b75de58
1 changed files with 7 additions and 5 deletions
@@ -44,15 +44,17 @@ public enum Scope {
        @Override
        <T> InternalFactory<? extends T> scopeFactory(Class<T> type, String name, final InternalFactory<? extends T> factory) {
            return new InternalFactory<T>() {
-                T instance;
+                volatile T instance;

                public T create(InternalContext context) {
-                    synchronized (context.getContainer()) {
-                        if (instance == null) {
-                            instance = InitializableFactory.wrapIfNeeded(factory).create(context);
+                    if (instance == null) {
+                        synchronized (context.getContainer()) {
+                            if (instance == null) {
+                                instance = InitializableFactory.wrapIfNeeded(factory).create(context);
+                            }
                        }
-                        return instance;
                    }
+                    return instance;
                }

                @Override