From f167d51eed27239fb7ac8c3b518742f5f0261677 Mon Sep 17 00:00:00 2001 From: rfeng Date: Thu, 19 Mar 2009 16:15:14 +0000 Subject: Move fault introspection into the FaultMapper git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@756073 13f79535-47bb-0310-9956-ffa450edef68 --- .../databinding/processor/DataBindingJavaInterfaceProcessor.java | 7 ------- .../sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) (limited to 'java/sca/modules') diff --git a/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java b/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java index 53a4aeca00..c915f389ea 100644 --- a/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java +++ b/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java @@ -125,13 +125,6 @@ public class DataBindingJavaInterfaceProcessor implements JavaInterfaceVisitor { } dataBindingRegistry.introspectType(d, operation); } - for (org.apache.tuscany.sca.interfacedef.DataType d : operation.getFaultTypes()) { - if (d.getDataBinding() == null) { - d.setDataBinding(dataBindingId); - } - // TODO: Handle exceptions - dataBindingRegistry.introspectType(d, operation); - } } } } diff --git a/java/sca/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java b/java/sca/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java index d3c461ff73..50cdde658e 100644 --- a/java/sca/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java +++ b/java/sca/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java @@ -318,7 +318,7 @@ public class JAXWSJavaInterfaceProcessor implements JavaInterfaceVisitor { for (DataType exceptionType : operation.getFaultTypes()) { faultExceptionMapper.introspectFaultDataType(exceptionType, operation, true); DataType faultType = (DataType)exceptionType.getLogical(); - if (faultType.getDataBinding() == JavaExceptionDataBinding.NAME) { + if (JavaExceptionDataBinding.NAME.equals(faultType.getDataBinding())) { // The exception class doesn't have an associated bean class, so // synthesize a virtual bean by introspecting the exception class. createSyntheticBean(operation, exceptionType); -- cgit v1.2.3