You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2013/06/07 16:06:43 UTC
svn commit: r1490655 -
/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/util/ServiceInfos.java
Author: rmannibucau
Date: Fri Jun 7 14:06:42 2013
New Revision: 1490655
URL: http://svn.apache.org/r1490655
Log:
TOMEE-965 looking into global services for cxf providers
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/util/ServiceInfos.java
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/util/ServiceInfos.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/util/ServiceInfos.java?rev=1490655&r1=1490654&r2=1490655&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/util/ServiceInfos.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/util/ServiceInfos.java Fri Jun 7 14:06:42 2013
@@ -19,6 +19,7 @@ package org.apache.openejb.assembler.cla
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.OpenEJBRuntimeException;
import org.apache.openejb.assembler.classic.Assembler;
+import org.apache.openejb.assembler.classic.OpenEjbConfiguration;
import org.apache.openejb.assembler.classic.ServiceInfo;
import org.apache.openejb.config.sys.MapFactory;
import org.apache.openejb.loader.SystemInstance;
@@ -85,6 +86,9 @@ public final class ServiceInfos {
// ignore
}
}
+ if (instance == null) {
+ instance = resolve(SystemInstance.get().getComponent(OpenEjbConfiguration.class).facilities.services, id);
+ }
if (instance != null) {
instances.add(instance);