[aries-cdi] branch master updated: [ARIES-2007] ensure owb extensionloader loads only once extensions

[rmannibucau]

This is an automated email from the ASF dual-hosted git repository.

rmannibucau pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-cdi.git


The following commit(s) were added to refs/heads/master by this push:
     new 1d45e08  [ARIES-2007] ensure owb extensionloader loads only once 
extensions
1d45e08 is described below

commit 1d45e0898d588c0c42a6b3ad010c56d203a0c7f1
Author: Romain Manni-Bucau <rmannibu...@gmail.com>
AuthorDate: Tue Sep 29 15:40:13 2020 +0200

    [ARIES-2007] ensure owb extensionloader loads only once extensions
---
 .../org/apache/aries/cdi/owb/core/OWBCDIContainerInitializer.java   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git 
a/cdi-owb/src/main/java/org/apache/aries/cdi/owb/core/OWBCDIContainerInitializer.java
 
b/cdi-owb/src/main/java/org/apache/aries/cdi/owb/core/OWBCDIContainerInitializer.java
index e8a9dd7..7249246 100644
--- 
a/cdi-owb/src/main/java/org/apache/aries/cdi/owb/core/OWBCDIContainerInitializer.java
+++ 
b/cdi-owb/src/main/java/org/apache/aries/cdi/owb/core/OWBCDIContainerInitializer.java
@@ -169,9 +169,15 @@ public class OWBCDIContainerInitializer extends 
CDIContainerInitializer {
 
                        bootstrap = new WebBeansContext(services, properties) {
                                private final ExtensionLoader 
overridenExtensionLoader = new ExtensionLoader(this) {
+                                       private boolean added;
+
                                        @Override
                                        public void loadExtensionServices() {
+                                               if (added) {
+                                                       return;
+                                               }
                                                extensions.forEach((k, v) -> 
addExtension(k));
+                                               added = true;
                                        }
                                };