Author: djencks
Date: Thu Aug 4 03:40:46 2011
New Revision: 1153739
URL: http://svn.apache.org/viewvc?rev=1153739&view=rev
Log:
OWB-582 use the default service if not configured in configuration so as to not
break geronimo integration
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java?rev=1153739&r1=1153738&r2=1153739&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java
Thu Aug 4 03:40:46 2011
@@ -46,6 +46,7 @@ import org.apache.webbeans.plugins.Plugi
import org.apache.webbeans.portable.AnnotatedElementFactory;
import org.apache.webbeans.portable.events.ExtensionLoader;
import org.apache.webbeans.proxy.JavassistProxyFactory;
+import org.apache.webbeans.service.DefaultImplementationLoaderService;
import org.apache.webbeans.spi.ContextsService;
import org.apache.webbeans.spi.ImplementationLoaderService;
import org.apache.webbeans.spi.ScannerService;
@@ -109,7 +110,14 @@ public class WebBeansContext
//pluggable service-loader
String implementationLoaderServiceName =
openWebBeansConfiguration.getProperty(ImplementationLoaderService.class.getName());
- implementationLoaderService =
ImplementationLoaderService.class.cast(get(implementationLoaderServiceName));
+ if (implementationLoaderServiceName == null)
+ {
+ implementationLoaderService = new
DefaultImplementationLoaderService();
+ }
+ else
+ {
+ implementationLoaderService =
ImplementationLoaderService.class.cast(get(implementationLoaderServiceName));
+ }
registerService(ImplementationLoaderService.class,
implementationLoaderService);
if (initialServices != null)
