You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2010/06/08 01:46:46 UTC
svn commit: r952489 -
/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/FinderFactory.java
Author: dblevins
Date: Mon Jun 7 23:46:46 2010
New Revision: 952489
URL: http://svn.apache.org/viewvc?rev=952489&view=rev
Log:
Attempt to get the factory from the SystemInstance before falling back to the singleton
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/FinderFactory.java
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/FinderFactory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/FinderFactory.java?rev=952489&r1=952488&r2=952489&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/FinderFactory.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/FinderFactory.java Mon Jun 7 23:46:46 2010
@@ -20,6 +20,7 @@ import org.apache.xbean.finder.AbstractF
import org.apache.xbean.finder.ClassFinder;
import org.apache.openejb.util.Logger;
import org.apache.openejb.util.LogCategory;
+import org.apache.openejb.loader.SystemInstance;
import java.io.File;
import java.net.URL;
@@ -45,10 +46,15 @@ public class FinderFactory {
return new FinderFactory();
}
+ private static FinderFactory get() {
+ FinderFactory factory = SystemInstance.get().getComponent(FinderFactory.class);
+ return (factory != null)? factory: FinderFactory.factory;
+ }
+
public static AbstractFinder createFinder(DeploymentModule module) throws Exception {
- return factory.create(module);
+ return get().create(module);
}
-
+
public AbstractFinder create(DeploymentModule module) throws Exception {
if (module instanceof WebModule) {
WebModule webModule = (WebModule) module;