Author: dkulp
Date: Tue Feb 19 20:51:56 2013
New Revision: 1447914

URL: http://svn.apache.org/r1447914
Log:
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.6.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderInterceptor.java

Modified: 
cxf/branches/2.6.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.6.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderInterceptor.java?rev=1447914&r1=1447913&r2=1447914&view=diff
==============================================================================
--- 
cxf/branches/2.6.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderInterceptor.java
 (original)
+++ 
cxf/branches/2.6.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderInterceptor.java
 Tue Feb 19 20:51:56 2013
@@ -104,12 +104,12 @@ 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 
(ServiceUtils.isSchemaValidationEnabled(SchemaValidationType.IN, message)) {
+                    Schema schema = 
EndpointReferenceUtils.getSchema(service.getServiceInfos().get(0), message
+                                                                     
.getExchange().getBus());
                     validateHeader(message, mpi, schema);
                 }
             } catch (Fault f) {


Reply via email to