Author: dkulp
Date: Fri Aug 19 02:31:27 2011
New Revision: 1159485
URL: http://svn.apache.org/viewvc?rev=1159485&view=rev
Log:
Merged revisions 1159482 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1159482 | ema | 2011-08-18 22:25:54 -0400 (Thu, 18 Aug 2011) | 1 line
[CXF-3740]:WSA handler have to throw WebServiceException on client side if
addressing is required but not found in the message
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
cxf/branches/2.4.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_disable/WSADisableTest.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.4.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java?rev=1159485&r1=1159484&r2=1159485&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
(original)
+++
cxf/branches/2.4.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
Fri Aug 19 02:31:27 2011
@@ -33,6 +33,7 @@ import java.util.logging.Logger;
import javax.wsdl.extensions.ExtensibilityElement;
import javax.xml.namespace.QName;
import javax.xml.ws.WebFault;
+import javax.xml.ws.WebServiceException;
import org.apache.cxf.Bus;
import org.apache.cxf.binding.soap.SoapBindingConstants;
@@ -616,7 +617,7 @@ public class MAPAggregator extends Abstr
}
if (missingWsaHeader) {
String reason = BUNDLE.getString("MISSING_ACTION_MESSAGE");
- throw new SoapFault(reason, new
QName(Names.WSA_NAMESPACE_NAME,
+ throw new WebServiceException(reason + new
QName(Names.WSA_NAMESPACE_NAME,
Names.HEADER_REQUIRED_NAME));
}
}
Modified:
cxf/branches/2.4.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_disable/WSADisableTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_disable/WSADisableTest.java?rev=1159485&r1=1159484&r2=1159485&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_disable/WSADisableTest.java
(original)
+++
cxf/branches/2.4.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_disable/WSADisableTest.java
Fri Aug 19 02:31:27 2011
@@ -28,6 +28,7 @@ import javax.xml.soap.MessageFactory;
import javax.xml.soap.SOAPMessage;
import javax.xml.ws.BindingProvider;
import javax.xml.ws.Dispatch;
+import javax.xml.ws.WebServiceException;
import javax.xml.ws.soap.AddressingFeature;
import org.apache.cxf.systest.ws.AbstractWSATestBase;
@@ -129,6 +130,7 @@ public class WSADisableTest extends Abst
port.addNumbers(1, 2);
fail("Expected missing WSA header exception");
} catch (Exception e) {
+ assertTrue("expected WebServiceException", e instanceof
WebServiceException);
String expected = "A required header representing a Message
Addressing"
+ " Property is not present";
assertTrue("Caught unexpected exception : " + e.getMessage(),
