You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2013/02/27 08:05:22 UTC
svn commit: r1450621 -
/cxf/branches/2.5.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderInterceptor.java
Author: dkulp
Date: Wed Feb 27 07:05:22 2013
New Revision: 1450621
URL: http://svn.apache.org/r1450621
Log:
Merged revisions 1447914 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........
r1447914 | dkulp | 2013-02-19 12:51:56 -0800 (Tue, 19 Feb 2013) | 18 lines
Merged revisions 1447901 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........
r1447901 | dkulp | 2013-02-19 15:27:18 -0500 (Tue, 19 Feb 2013) | 10 lines
Merged revisions 1447875 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1447875 | dkulp | 2013-02-19 14:16:50 -0500 (Tue, 19 Feb 2013) | 2 lines
Only grab the schema if we actually need it.
........
........
........
Modified:
cxf/branches/2.5.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderInterceptor.java
Modified: cxf/branches/2.5.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderInterceptor.java?rev=1450621&r1=1450620&r2=1450621&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderInterceptor.java (original)
+++ cxf/branches/2.5.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderInterceptor.java Wed Feb 27 07:05:22 2013
@@ -103,14 +103,14 @@ public class SoapHeaderInterceptor exten
boolean supportsNode = this.supportsDataReader(message, Node.class);
Service service = ServiceModelUtil.getService(message.getExchange());
- Schema schema = EndpointReferenceUtils.getSchema(service.getServiceInfos().get(0), message
- .getExchange().getBus());
for (SoapHeaderInfo header : headers) {
MessagePartInfo mpi = header.getPart();
try {
if (MessageUtils.getContextualBoolean(message,
org.apache.cxf.message.Message.SCHEMA_VALIDATION_ENABLED,
Boolean.FALSE)) {
+ Schema schema = EndpointReferenceUtils.getSchema(service.getServiceInfos().get(0), message
+ .getExchange().getBus());
validateHeader(message, mpi, schema);
}
} catch (Fault f) {