TUSCANY-3890 - separate the request wrapper model from the response wrapper model as per the change in 1.x under TUSCANY-2931.

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

2 files changed, 4 insertions, 4 deletions

diff --git a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/AsyncJDKInvocationHandler.java b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/AsyncJDKInvocationHandler.java
index 89388fa9af..dc5738af96 100644
--- a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/AsyncJDKInvocationHandler.java
+++ b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/AsyncJDKInvocationHandler.java
@@ -379,8 +379,8 @@ public class AsyncJDKInvocationHandler extends JDKInvocationHandler {
                     if (type instanceof ParameterizedType) {
                         // Check if the parameterized type of Response<T> is a doc-lit-wrapper class
                         Class<?> wrapperClass = (Class<?>)((ParameterizedType)type).getActualTypeArguments()[0];
-                        WrapperInfo wrapperInfo = chain.getSourceOperation().getWrapper();
-                        if (wrapperInfo != null && wrapperInfo.getOutputWrapperClass() == wrapperClass) {
+                        WrapperInfo wrapperInfo = chain.getSourceOperation().getOutputWrapper();
+                        if (wrapperInfo != null && wrapperInfo.getWrapperClass() == wrapperClass) {
                             Object wrapper = wrapperClass.newInstance();
                             // Find the 1st matching property
                             for (PropertyDescriptor p : Introspector.getBeanInfo(wrapperClass).getPropertyDescriptors()) {
diff --git a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java
index 41f469cc1b..827008dc73 100644
--- a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java
+++ b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java
@@ -214,8 +214,8 @@ public class JDKInvocationHandler implements InvocationHandler, Serializable {
         Class<?>[] params = method.getParameterTypes();
 
         DataType<List<DataType>> inputType = null;
-        if (operation.isWrapperStyle()) {
-            inputType = operation.getWrapper().getUnwrappedInputType();
+        if (operation.isInputWrapperStyle()) {
+            inputType = operation.getInputWrapper().getUnwrappedType();
         } else {
             inputType = operation.getInputType();
         }