Fix for TUSCANY-3000

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@770058 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 9 insertions, 8 deletions

diff --git a/branches/sca-java-1.x/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java b/branches/sca-java-1.x/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
index e585b3d46f..29e02da648 100644
--- a/branches/sca-java-1.x/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
+++ b/branches/sca-java-1.x/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
@@ -6,15 +6,15 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 package org.apache.tuscany.sca.implementation.java.invocation;
 
@@ -37,6 +37,7 @@ import org.apache.tuscany.sca.assembly.ComponentService;
 import org.apache.tuscany.sca.assembly.Multiplicity;
 import org.apache.tuscany.sca.assembly.Reference;
 import org.apache.tuscany.sca.context.ComponentContextFactory;
+import org.apache.tuscany.sca.context.PropertyValueFactory;
 import org.apache.tuscany.sca.context.RequestContextFactory;
 import org.apache.tuscany.sca.core.context.ComponentContextImpl;
 import org.apache.tuscany.sca.core.context.InstanceWrapper;
@@ -68,7 +69,7 @@ import org.osoa.sca.annotations.ConversationID;
 
 /**
  * The runtime instantiation of Java component implementations
- * 
+ *
  * @version $Rev$ $Date$
  */
 public class JavaComponentContextProvider {
@@ -81,7 +82,7 @@ public class JavaComponentContextProvider {
     public JavaComponentContextProvider(RuntimeComponent component,
                                         JavaInstanceFactoryProvider configuration,
                                         DataBindingExtensionPoint dataBindingExtensionPoint,
-                                        JavaPropertyValueObjectFactory propertyValueObjectFactory,
+                                        PropertyValueFactory propertyValueObjectFactory,
                                         ComponentContextFactory componentContextFactory,
                                         RequestContextFactory requestContextFactory) {
         super();
@@ -94,7 +95,7 @@ public class JavaComponentContextProvider {
         //        }
         this.component = component;
         this.dataBindingRegistry = dataBindingExtensionPoint;
-        this.propertyValueFactory = propertyValueObjectFactory;
+        this.propertyValueFactory = (JavaPropertyValueObjectFactory) propertyValueObjectFactory;
     }
 
     InstanceWrapper<?> createInstanceWrapper() throws ObjectCreationException {
@@ -132,7 +133,7 @@ public class JavaComponentContextProvider {
             ObjectFactory<?> propertyObjectFactory =
                 createPropertyValueFactory(configuredProperty, configuredProperty.getValue(), element);
             instanceFactoryProvider.setObjectFactory(element, propertyObjectFactory);
-            
+
             JavaConstructorImpl constructor = instanceFactoryProvider.getImplementation().getConstructor();
             for(JavaElementImpl p: constructor.getParameters()){
                 if(element.getName().equals(p.getName())) {
@@ -265,7 +266,7 @@ public class JavaComponentContextProvider {
         }
 
         // We need to set the PropertyValueFactory on the ComponentContextImpl
-        // so the ComponentContext can "de-marshal" the property type to a value 
+        // so the ComponentContext can "de-marshal" the property type to a value
         // when the getProperty() method is called
         ComponentContextImpl ccImpl = (ComponentContextImpl)component.getComponentContext();
         ccImpl.setPropertyValueFactory(propertyValueFactory);