Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0F825EF05 for ; Tue, 19 Feb 2013 20:52:17 +0000 (UTC) Received: (qmail 63060 invoked by uid 500); 19 Feb 2013 20:52:17 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 62990 invoked by uid 500); 19 Feb 2013 20:52:16 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 62982 invoked by uid 99); 19 Feb 2013 20:52:16 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Feb 2013 20:52:16 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Feb 2013 20:52:15 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D0BD42388A5E; Tue, 19 Feb 2013 20:51:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1447914 - /cxf/branches/2.6.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderInterceptor.java Date: Tue, 19 Feb 2013 20:51:56 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130219205156.D0BD42388A5E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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) {