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 164CF9A22 for ; Wed, 11 Jan 2012 21:18:30 +0000 (UTC) Received: (qmail 74402 invoked by uid 500); 11 Jan 2012 21:18:30 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 74285 invoked by uid 500); 11 Jan 2012 21:18:29 -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 74278 invoked by uid 99); 11 Jan 2012 21:18:28 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Jan 2012 21:18:28 +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; Wed, 11 Jan 2012 21:18:28 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id CECEC238899C for ; Wed, 11 Jan 2012 21:18:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1230255 - /cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomAttributeStatementProvider.java Date: Wed, 11 Jan 2012 21:18:07 -0000 To: commits@cxf.apache.org From: owulff@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120111211807.CECEC238899C@eris.apache.org> Author: owulff Date: Wed Jan 11 21:18:07 2012 New Revision: 1230255 URL: http://svn.apache.org/viewvc?rev=1230255&view=rev Log: Failing sts systest fixed Modified: cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomAttributeStatementProvider.java Modified: cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomAttributeStatementProvider.java URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomAttributeStatementProvider.java?rev=1230255&r1=1230254&r2=1230255&view=diff ============================================================================== --- cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomAttributeStatementProvider.java (original) +++ cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomAttributeStatementProvider.java Wed Jan 11 21:18:07 2012 @@ -49,15 +49,18 @@ public class CustomAttributeStatementPro providerParameters.getRealm() ); } - - List attributeList = new ArrayList(); - String tokenType = providerParameters.getTokenRequirements().getTokenType(); - + if (retrievedClaims == null) { + return null; + } + Iterator claimIterator = retrievedClaims.iterator(); if (!claimIterator.hasNext()) { return null; } + List attributeList = new ArrayList(); + String tokenType = providerParameters.getTokenRequirements().getTokenType(); + AttributeStatementBean attrBean = new AttributeStatementBean(); while (claimIterator.hasNext()) { Claim claim = claimIterator.next();