Author: dkulp
Date: Thu Dec 16 21:25:57 2010
New Revision: 1050167
URL: http://svn.apache.org/viewvc?rev=1050167&view=rev
Log:
Merged revisions 1050165 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1050165 | dkulp | 2010-12-16 16:23:25 -0500 (Thu, 16 Dec 2010) | 1 line
Slight optimization.
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/MustUnderstandInterceptor.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 16 21:25:57 2010
@@ -1 +1 @@
-/cxf/trunk:1041183,1041790,1041993,1042346,1042571,1042724,1042805,1042821,1043225,1043229,1043902,1043907,1043954,1044085,1044238-1044305,1045024,1048915,1048919,1048930,1049078,1049937,1050005,1050021,1050095,1050102,1050113,1050156
+/cxf/trunk:1041183,1041790,1041993,1042346,1042571,1042724,1042805,1042821,1043225,1043229,1043902,1043907,1043954,1044085,1044238-1044305,1045024,1048915,1048919,1048930,1049078,1049937,1050005,1050021,1050095,1050102,1050113,1050156,1050165
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
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=1050167&r1=1050166&r2=1050167&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
Thu Dec 16 21:25:57 2010
@@ -87,6 +87,7 @@ public class MustUnderstandInterceptor e
soapVersion.getMustUnderstand());
if (!isRequestor(soapMessage)) {
soapMessage.put(MustUnderstandInterceptor.FAULT, soapFault);
+ soapMessage.getInterceptorChain().add(ending);
} else {
throw soapFault;
}
@@ -94,9 +95,6 @@ public class MustUnderstandInterceptor e
if (!ultimateReceiverHeaders.isEmpty() && !isRequestor(soapMessage)) {
checkUltimateReceiverHeaders(ultimateReceiverHeaders,
mustUnderstandQNames, soapMessage);
}
- if (!isRequestor(soapMessage)) {
- soapMessage.getInterceptorChain().add(ending);
- }
}
private void checkUltimateReceiverHeaders(Set<Header>
ultimateReceiverHeaders,
