You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2021/12/20 11:31:39 UTC
[tomee] branch master updated: TOMEE-3821 Upgrade to Apache OpenWebBeans 2.0.25 due to a regression in previous version
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/master by this push:
new cc22073 TOMEE-3821 Upgrade to Apache OpenWebBeans 2.0.25 due to a regression in previous version
cc22073 is described below
commit cc22073e5dfa5ae520a76d71cee766e659a76b7c
Author: Jean-Louis Monteiro <jl...@tomitribe.com>
AuthorDate: Mon Dec 20 12:31:27 2021 +0100
TOMEE-3821 Upgrade to Apache OpenWebBeans 2.0.25 due to a regression in previous version
---
.../src/main/java/org/apache/openejb/cdi/WebappBeanManager.java | 5 +++++
.../main/java/org/apache/openejb/cdi/WebappNotificationManager.java | 2 --
pom.xml | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java b/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java
index fc63bf0..69ea4da 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java
@@ -26,6 +26,7 @@ import org.apache.webbeans.container.BeanManagerImpl;
import org.apache.webbeans.container.InjectableBeanManager;
import org.apache.webbeans.context.creational.CreationalContextImpl;
import org.apache.webbeans.event.EventMetadataImpl;
+import org.apache.webbeans.event.NotificationManager;
import org.apache.webbeans.util.Asserts;
import org.apache.webbeans.util.WebBeansUtil;
@@ -301,6 +302,10 @@ public class WebappBeanManager extends BeanManagerImpl {
started = true;
deploymentBeans = mergeBeans();
webappCtx.getBeanManagerImpl().getInjectionResolver().clearCaches(); // to force new resolution with new beans
+ final NotificationManager notificationManager = webappCtx.getNotificationManager();
+ if (notificationManager instanceof WebappNotificationManager) { // should always be the case
+ ((WebappNotificationManager) notificationManager).afterStart();
+ } // otherwise, OWB itself knows when it's ready
}
private Set<Bean<?>> mergeBeans() {
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappNotificationManager.java b/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappNotificationManager.java
index 84e78a6..7ed4e31 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappNotificationManager.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappNotificationManager.java
@@ -45,10 +45,8 @@ public final class WebappNotificationManager extends NotificationManager {
}
- @Override
public void afterStart() {
hasStarted = true;
- super.afterStart();
}
/**
diff --git a/pom.xml b/pom.xml
index f7a90f2..7072aaa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,7 +115,7 @@
<geronimo-javamail_1.6_mail.version>1.0.1</geronimo-javamail_1.6_mail.version>
<openjpa.version>3.2.0</openjpa.version>
- <openwebbeans.version>2.0.24</openwebbeans.version>
+ <openwebbeans.version>2.0.25</openwebbeans.version>
<jcs.version>2.1</jcs.version>
<johnzon.version>1.2.15</johnzon.version>
<quartz-openejb-shade.version>2.2.4</quartz-openejb-shade.version>