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 C5CAA178EE for ; Tue, 21 Oct 2014 20:15:48 +0000 (UTC) Received: (qmail 98737 invoked by uid 500); 21 Oct 2014 20:15:48 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 98682 invoked by uid 500); 21 Oct 2014 20:15:48 -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 98673 invoked by uid 99); 21 Oct 2014 20:15:48 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Oct 2014 20:15:48 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5CD2F93BB43; Tue, 21 Oct 2014 20:15:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dkulp@apache.org To: commits@cxf.apache.org Message-Id: <694916b813084ad6981e8cd94a46c071@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: [CXF-6038] Only add the handler interceptors once This closes #26 Date: Tue, 21 Oct 2014 20:15:48 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/master da9070b37 -> 80ea71977 [CXF-6038] Only add the handler interceptors once This closes #26 Signed-off-by: Daniel Kulp Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/80ea7197 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/80ea7197 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/80ea7197 Branch: refs/heads/master Commit: 80ea7197789ffb8720827aa9291fc4f40c09580d Parents: da9070b Author: Kyle Lape Authored: Fri Oct 10 14:34:07 2014 -0700 Committer: Daniel Kulp Committed: Tue Oct 21 16:15:36 2014 -0400 ---------------------------------------------------------------------- .../apache/cxf/jaxws/support/JaxWsEndpointImpl.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/80ea7197/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java index accc5f4..6f0be97 100644 --- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java +++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java @@ -123,6 +123,7 @@ public class JaxWsEndpointImpl extends EndpointImpl { private SOAPHandlerFaultOutInterceptor soapFaultOutInterceptor; private LogicalHandlerFaultInInterceptor logicalFaultInInterceptor; private SOAPHandlerFaultInInterceptor soapFaultInInterceptor; + private boolean handlerInterceptorsAdded; public JaxWsEndpointImpl(Bus bus, Service s, EndpointInfo ei) throws EndpointException { this(bus, s, ei, null, null, null, true); @@ -543,6 +544,12 @@ public class JaxWsEndpointImpl extends EndpointImpl { } public void addHandlerInterceptors() { + if (handlerInterceptorsAdded) { + return; + } + + handlerInterceptorsAdded = true; + List> in = super.getInInterceptors(); List> out = super.getOutInterceptors(); List> outFault = super.getOutFaultInterceptors(); @@ -564,6 +571,12 @@ public class JaxWsEndpointImpl extends EndpointImpl { } } public void removeHandlerInterceptors() { + if (!handlerInterceptorsAdded) { + return; + } + + handlerInterceptorsAdded = false; + List> in = super.getInInterceptors(); List> out = super.getOutInterceptors(); List> outFault = super.getOutFaultInterceptors();