Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 47408 invoked from network); 24 Jul 2009 17:58:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 24 Jul 2009 17:58:26 -0000 Received: (qmail 17336 invoked by uid 500); 24 Jul 2009 17:59:31 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 17260 invoked by uid 500); 24 Jul 2009 17:59:31 -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 17251 invoked by uid 99); 24 Jul 2009 17:59:31 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Jul 2009 17:59:31 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Fri, 24 Jul 2009 17:59:28 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id F17522388882; Fri, 24 Jul 2009 17:59:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r797581 - /cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java Date: Fri, 24 Jul 2009 17:59:06 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090724175906.F17522388882@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Fri Jul 24 17:59:06 2009 New Revision: 797581 URL: http://svn.apache.org/viewvc?rev=797581&view=rev Log: [CXF-2356] Make sure the wss4j processing is only done once for faults Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java?rev=797581&r1=797580&r2=797581&view=diff ============================================================================== --- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java (original) +++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java Fri Jul 24 17:59:06 2009 @@ -81,6 +81,8 @@ public static final String PRINCIPAL_RESULT = "wss4j.principal.result"; public static final String PROCESSOR_MAP = "wss4j.processor.map"; + private static final String SECURITY_PROCESSED = WSS4JInInterceptor.class.getName() + ".DONE"; + private static final Logger LOG = LogUtils.getL7dLogger(WSS4JInInterceptor.class); private static final Logger TIME_LOG = LogUtils.getL7dLogger(WSS4JInInterceptor.class, null, @@ -142,6 +144,10 @@ } public void handleMessage(SoapMessage msg) throws Fault { + if (msg.containsKey(SECURITY_PROCESSED)) { + return; + } + msg.put(SECURITY_PROCESSED, Boolean.TRUE); SOAPMessage doc = getSOAPMessage(msg); boolean doDebug = LOG.isLoggable(Level.FINE);