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 6BB3B1194D for ; Tue, 15 Apr 2014 13:07:37 +0000 (UTC) Received: (qmail 7418 invoked by uid 500); 15 Apr 2014 13:07:34 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 7273 invoked by uid 500); 15 Apr 2014 13:07: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 7113 invoked by uid 99); 15 Apr 2014 13:07:26 -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, 15 Apr 2014 13:07:26 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B50358BC6EB; Tue, 15 Apr 2014 13:07:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: coheigea@apache.org To: commits@cxf.apache.org Date: Tue, 15 Apr 2014 13:07:25 -0000 Message-Id: <4ccec2e262474244adc67d9973e3587a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] git commit: More minor stuff Repository: cxf Updated Branches: refs/heads/master 210d24b39 -> 5204b1ec6 More minor stuff Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5204b1ec Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5204b1ec Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5204b1ec Branch: refs/heads/master Commit: 5204b1ec6ae0424b77b38e16f4e17f39f7c9f86d Parents: 19ba5d0 Author: Colm O hEigeartaigh Authored: Tue Apr 15 14:04:56 2014 +0100 Committer: Colm O hEigeartaigh Committed: Tue Apr 15 14:05:27 2014 +0100 ---------------------------------------------------------------------- .../wss4j/PolicyStaxActionInInterceptor.java | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/5204b1ec/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyStaxActionInInterceptor.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyStaxActionInInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyStaxActionInInterceptor.java index 593f21f..59a13b1 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyStaxActionInInterceptor.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyStaxActionInInterceptor.java @@ -72,7 +72,7 @@ public class PolicyStaxActionInInterceptor extends AbstractPhaseInterceptor incomingSecurityEventList) { - for (SecurityEvent incomingEvent : incomingSecurityEventList) { - if (event == incomingEvent.getSecurityEventType()) { - return true; - } - } - return false; - } - private SecurityEvent findEvent(Event event, List incomingSecurityEventList) { for (SecurityEvent incomingEvent : incomingSecurityEventList) { if (event == incomingEvent.getSecurityEventType()) { @@ -126,7 +117,7 @@ public class PolicyStaxActionInInterceptor extends AbstractPhaseInterceptor sp11Ais = aim.get(new QName(spNamespace, SPConstants.ALGORITHM_SUITE)); - if (sp11Ais != null) { + if (sp11Ais != null && !sp11Ais.isEmpty()) { for (AssertionInfo ai : sp11Ais) { ai.setAsserted(true); AlgorithmSuite algorithmSuite = (AlgorithmSuite)ai.getAssertion(); @@ -137,7 +128,7 @@ public class PolicyStaxActionInInterceptor extends AbstractPhaseInterceptor algAis = aim.get(new QName(namespace, algorithmSuiteType.getName())); - if (algAis != null) { + if (algAis != null && !algAis.isEmpty()) { for (AssertionInfo algAi : algAis) { algAi.setAsserted(true); }