Author: antelder
Date: Tue Dec 13 09:20:13 2011
New Revision: 1213621
URL: http://svn.apache.org/viewvc?rev=1213621&view=rev
Log:
Update so that JavaImplementationProvider works with both OASIS and Tuscany
ComponentContext types
Modified:
tuscany/sca-java-2.x/trunk/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
Modified:
tuscany/sca-java-2.x/trunk/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java?rev=1213621&r1=1213620&r2=1213621&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
Tue Dec 13 09:20:13 2011
@@ -96,7 +96,7 @@ public class JavaImplementationProvider
(ObjectFactory<?>)componentContextProvider.getInstanceFactoryProvider().getFactories().get(resource.getElement());
if (objectFactory == null) {
Class<?> type = resource.getElement().getType();
- if (ComponentContext.class.equals(type)) {
+ if (ComponentContext.class.isAssignableFrom(type)) {
objectFactory = new
JavaComponentContextFactory(componentContextProvider);
} else if (RequestContext.class.equals(type)) {
objectFactory = new
RequestContextObjectFactory(requestContextFactory,
componentContextProvider.getComponent());