You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by tl...@apache.org on 2006/11/02 07:03:31 UTC
svn commit: r470237 - in /incubator/cxf/trunk:
rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptor.java
systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLWrapTest.java
Author: tli
Date: Wed Nov 1 22:03:30 2006
New Revision: 470237
URL: http://svn.apache.org/viewvc?view=rev&rev=470237
Log:
CXF-194 fixed xml fault bug
Modified:
incubator/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptor.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLWrapTest.java
Modified: incubator/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptor.java?view=diff&rev=470237&r1=470236&r2=470237
==============================================================================
--- incubator/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptor.java (original)
+++ incubator/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptor.java Wed Nov 1 22:03:30 2006
@@ -59,7 +59,7 @@
try {
nsStack.add(XMLConstants.NS_XML_FORMAT);
String prefix = nsStack.getPrefix(XMLConstants.NS_XML_FORMAT);
-
+
StaxUtils.writeStartElement(writer, prefix, XMLFault.XML_FAULT_ROOT, XMLConstants.NS_XML_FORMAT);
StaxUtils
@@ -80,7 +80,7 @@
while (it.hasNext()) {
FaultInfo fi = it.next();
for (MessagePartInfo mpi : fi.getMessageParts()) {
- Class cls = mpi.getProperty(Class.class.getName(), Class.class);
+ Class cls = mpi.getTypeClass();
Method method = t.getClass().getMethod("getFaultInfo", new Class[0]);
Class sub = method.getReturnType();
if (cls != null && cls.equals(sub)) {
@@ -96,7 +96,7 @@
dataWriter.write(getFaultInfo(t), part, message);
writer.writeEndElement();
}
- }
+ }
// fault root
writer.writeEndElement();
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLWrapTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLWrapTest.java?view=diff&rev=470237&r1=470236&r2=470237
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLWrapTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLWrapTest.java Wed Nov 1 22:03:30 2006
@@ -156,9 +156,6 @@
assertEquals("text/xml", contentType);
Integer responseCode = (Integer) responseContext.get(Message.RESPONSE_CODE);
assertEquals(500, responseCode.intValue());
- } catch (Exception ex) {
- assertTrue("did not catch expected PingMeFault exception",
- !(ex instanceof PingMeFault));
}
}
}