antelder 2002/06/25 04:04:40
Modified: java/src/org/apache/wsif/providers/soap/apacheaxis
WSIFOperation_ApacheAxis.java
java/src/org/apache/wsif/providers/soap/apachesoap
WSIFOperation_ApacheSOAP.java
java/test/faults FaultMsgTest.java
Log:
Fix defect 135808 - should only have a single part in a fault message
Revision Changes Path
1.11 +0 -5
xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apacheaxis/WSIFOperation_ApacheAxis.java
Index: WSIFOperation_ApacheAxis.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apacheaxis/WSIFOperation_ApacheAxis.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- WSIFOperation_ApacheAxis.java 24 Jun 2002 13:11:20 -0000 1.10
+++ WSIFOperation_ApacheAxis.java 25 Jun 2002 11:04:40 -0000 1.11
@@ -581,11 +581,6 @@
if (wsifmessage2 != null) {
AxisFault f = (AxisFault) response;
wsifmessage2.setName(WSIFConstants.SOAP_FAULT_MSG_NAME);
- wsifmessage2.setObjectPart(
- WSIFConstants.SOAP_FAULT_CODE,
- f.getFaultCode().getLocalPart());
- wsifmessage2.setObjectPart(WSIFConstants.SOAP_FAULT_STRING,
f.getFaultString());
- wsifmessage2.setObjectPart(WSIFConstants.SOAP_FAULT_ACTOR,
f.getFaultActor());
wsifmessage2.setObjectPart(WSIFConstants.SOAP_FAULT_OBJECT, f);
}
Tr.exit(false);
1.11 +0 -7
xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apachesoap/WSIFOperation_ApacheSOAP.java
Index: WSIFOperation_ApacheSOAP.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apachesoap/WSIFOperation_ApacheSOAP.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- WSIFOperation_ApacheSOAP.java 24 Jun 2002 13:11:18 -0000 1.10
+++ WSIFOperation_ApacheSOAP.java 25 Jun 2002 11:04:40 -0000 1.11
@@ -544,13 +544,6 @@
if (fault != null) {
org.apache.soap.Fault soapFault = resp.getFault();
fault.setName(WSIFConstants.SOAP_FAULT_MSG_NAME);
- fault.setObjectPart(WSIFConstants.SOAP_FAULT_CODE,
soapFault.getFaultCode());
- fault.setObjectPart(
- WSIFConstants.SOAP_FAULT_STRING,
- soapFault.getFaultString());
- fault.setObjectPart(
- WSIFConstants.SOAP_FAULT_ACTOR,
- soapFault.getFaultActorURI());
fault.setObjectPart(WSIFConstants.SOAP_FAULT_OBJECT, soapFault);
}
Tr.exit(false);
1.4 +5 -8 xml-axis-wsif/java/test/faults/FaultMsgTest.java
Index: FaultMsgTest.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/faults/FaultMsgTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FaultMsgTest.java 12 Jun 2002 10:27:25 -0000 1.3
+++ FaultMsgTest.java 25 Jun 2002 11:04:40 -0000 1.4
@@ -91,7 +91,9 @@
}
public static void main(String[] args) {
- junit.textui.TestRunner.run(suite());
+ TestUtilities.startListeners();
+ junit.textui.TestRunner.run (suite());
+ TestUtilities.stopListeners();
}
public static Test suite() {
@@ -194,20 +196,15 @@
assertEquals("ok getQuote response", false, ok);
String name = fault1.getName();
- String fcode = (String)
fault1.getObjectPart(WSIFConstants.SOAP_FAULT_CODE);
- String fstring = (String)
fault1.getObjectPart(WSIFConstants.SOAP_FAULT_STRING);
- String factor = (String)
fault1.getObjectPart(WSIFConstants.SOAP_FAULT_ACTOR);
Object fobject = fault1.getObjectPart(WSIFConstants.SOAP_FAULT_OBJECT);
assertEquals("fault message name", WSIFConstants.SOAP_FAULT_MSG_NAME,
name);
if ("axis".equals(protocol)) {
assertTrue("fault obj type", fobject instanceof
org.apache.axis.AxisFault);
- System.out.println(
- "AxisFault code=" + fcode + " actor=" + factor + " string=" +
fstring);
+ System.out.println( "AxisFault=" + fobject );
} else {
assertTrue("fault obj type", fobject instanceof
org.apache.soap.Fault);
- System.out.println(
- "SOAPFault code=" + fcode + " actor=" + factor + " string=" +
fstring);
+ System.out.println( "SOAPFault=" + fobject );
}
// now a call where the remote service returns a fault;
