Fix for TUSCANY-3832. Also tries to simplify wrapped vs. bare terminology by introducing "notSubjectToWrapping" as a term in place of "bare".

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

1 files changed, 9 insertions, 0 deletions

diff --git a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java b/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
index 486081dfec..5e0f6d4e65 100644
--- a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
+++ b/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
@@ -347,6 +347,15 @@ public class InterfaceContractMapperImpl implements InterfaceContractMapper {
         return isCompatible(source, target, compatibilityType, true);
     }
 
+    @Override
+    public boolean isCompatibleWithoutUnwrapByValue(Operation source, Operation target, Compatibility compatibilityType) {
+        if (!source.isWrapperStyle() == target.isWrapperStyle()) {
+            return false; 
+        } else {
+            return isCompatible(source, target, compatibilityType, true);
+        }
+    }
+    
     // FIXME: How to improve the performance for the lookup
     private Operation getOperation(List<Operation> operations, String name) {
         for (Operation op : operations) {