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 87AC010E8A for ; Thu, 2 May 2013 23:07:42 +0000 (UTC) Received: (qmail 16651 invoked by uid 500); 2 May 2013 23:07:42 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 16541 invoked by uid 500); 2 May 2013 23:07:42 -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 16528 invoked by uid 99); 2 May 2013 23:07:42 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 May 2013 23:07:42 +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; Thu, 02 May 2013 23:07:41 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 46877238899C; Thu, 2 May 2013 23:07:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1478598 - /cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java Date: Thu, 02 May 2013 23:07:21 -0000 To: commits@cxf.apache.org From: asoldano@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130502230721.46877238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: asoldano Date: Thu May 2 23:07:20 2013 New Revision: 1478598 URL: http://svn.apache.org/r1478598 Log: [CXF-4997] Skip PolicyBasedWSS4JInInterceptor processing when AssertionInfoMap not available Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java?rev=1478598&r1=1478597&r2=1478598&view=diff ============================================================================== --- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java (original) +++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java Thu May 2 23:07:20 2013 @@ -51,6 +51,7 @@ import org.apache.cxf.endpoint.Endpoint; import org.apache.cxf.helpers.CastUtils; import org.apache.cxf.helpers.DOMUtils; import org.apache.cxf.helpers.MapNamespaceContext; +import org.apache.cxf.interceptor.Fault; import org.apache.cxf.resource.ResourceManager; import org.apache.cxf.service.model.EndpointInfo; import org.apache.cxf.ws.policy.AssertionInfo; @@ -113,6 +114,13 @@ public class PolicyBasedWSS4JInIntercept super(true); } + public void handleMessage(SoapMessage msg) throws Fault { + AssertionInfoMap aim = msg.get(AssertionInfoMap.class); + if (aim != null) { + super.handleMessage(msg); + } + } + private static Properties getProps(Object o, URL propsURL, SoapMessage message) { Properties properties = null; if (o instanceof Properties) {