Author: ema
Date: Wed Dec 15 04:39:41 2010
New Revision: 1049423
URL: http://svn.apache.org/viewvc?rev=1049423&view=rev
Log:
Merged revisions 1049415 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1049415 | ema | 2010-12-15 12:23:19 +0800 (Wed, 15 Dec 2010) | 1 line
[CXF-3188]:Optimized the code a bit(thanks Dan for review my commit);Removed
the wrong annotation @Override, it's strange the build is successful on jdk6
and fedora machine
........
Modified:
cxf/branches/2.3.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/MustUnderstandInterceptor.java
Modified:
cxf/branches/2.3.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/MustUnderstandInterceptor.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/MustUnderstandInterceptor.java?rev=1049423&r1=1049422&r2=1049423&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/MustUnderstandInterceptor.java
(original)
+++
cxf/branches/2.3.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/MustUnderstandInterceptor.java
Wed Dec 15 04:39:41 2010
@@ -94,7 +94,9 @@ public class MustUnderstandInterceptor e
if (!ultimateReceiverHeaders.isEmpty() && !isRequestor(soapMessage)) {
checkUltimateReceiverHeaders(ultimateReceiverHeaders,
mustUnderstandQNames, soapMessage);
}
- soapMessage.getInterceptorChain().add(ending);
+ if (!isRequestor(soapMessage)) {
+ soapMessage.getInterceptorChain().add(ending);
+ }
}
private void checkUltimateReceiverHeaders(Set<Header>
ultimateReceiverHeaders,
@@ -252,8 +254,7 @@ public class MustUnderstandInterceptor e
public MustUnderstandEndingInterceptor(String phase) {
super(phase);
}
-
- @Override
+
public void handleMessage(SoapMessage message) throws Fault {
// throws soapFault after the response code 202 is set in
OneWayProcessorInterceptor
if (message.get(MustUnderstandInterceptor.FAULT) != null) {
