Skip to content

Commit 3429233

Browse files
committed
OWB remove explicit enabling of conversation support (OWB-1074)
1 parent 85f405a commit 3429233

1 file changed

Lines changed: 1 addition & 3 deletions

File tree

container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ public void initialize(final StartupObject startupObject) {
126126
//from CDI builder
127127
properties.setProperty(OpenWebBeansConfiguration.INTERCEPTOR_FORCE_NO_CHECKED_EXCEPTIONS, "false");
128128
properties.setProperty(SecurityService.class.getName(), ManagedSecurityService.class.getName());
129-
properties.setProperty(OpenWebBeansConfiguration.APPLICATION_SUPPORTS_CONVERSATION, "true");
130129
properties.setProperty(OpenWebBeansConfiguration.IGNORED_INTERFACES, "org.apache.aries.proxy.weaving.WovenProxy");
131130

132131
final boolean tomee = SystemInstance.get().getProperty("openejb.loader", "foo").startsWith("tomcat");
@@ -252,8 +251,7 @@ public String toString() {
252251
}
253252

254253
// we want the same reference as the ContextsService if that's our impl
255-
if (webBeansContext.getOpenWebBeansConfiguration().supportsConversation()
256-
&& "org.apache.webbeans.jsf.DefaultConversationService".equals(webBeansContext.getOpenWebBeansConfiguration().getProperty(ConversationService.class.getName()))) {
254+
if ("org.apache.webbeans.jsf.DefaultConversationService".equals(webBeansContext.getOpenWebBeansConfiguration().getProperty(ConversationService.class.getName()))) {
257255
webBeansContext.registerService(ConversationService.class, ConversationService.class.cast(webBeansContext.getService(ContextsService.class)));
258256
}
259257

0 commit comments

Comments
 (0)