From commits-return-37955-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org Fri Aug 21 16:12:52 2015 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 80D2F1859C for ; Fri, 21 Aug 2015 16:12:52 +0000 (UTC) Received: (qmail 60536 invoked by uid 500); 21 Aug 2015 16:12:52 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 60477 invoked by uid 500); 21 Aug 2015 16:12:52 -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 60468 invoked by uid 99); 21 Aug 2015 16:12:52 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Aug 2015 16:12:52 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 48DF1E0243; Fri, 21 Aug 2015 16:12:52 +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 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: Minor fix to last commit Date: Fri, 21 Aug 2015 16:12:52 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 5a5d71988 -> 2a2ad32d6 Minor fix to last commit Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2a2ad32d Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2a2ad32d Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2a2ad32d Branch: refs/heads/3.0.x-fixes Commit: 2a2ad32d681234a00eac97002848fde7a63968e5 Parents: 5a5d719 Author: Colm O hEigeartaigh Authored: Fri Aug 21 17:09:10 2015 +0100 Committer: Colm O hEigeartaigh Committed: Fri Aug 21 17:12:44 2015 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/2a2ad32d/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java index f169e39..d448ed2 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ClaimsManager.java @@ -192,7 +192,7 @@ public class ClaimsManager { STSException.REQUEST_FAILED); } - if (targetPrincipal == null) { + if (targetPrincipal == null || targetPrincipal.getName() == null) { LOG.log(Level.WARNING, "Null. Failed to map user '" + parameters.getPrincipal().getName() + "' [" + parameters.getRealm() + "] to realm '" + handlerRealmSupport.getHandlerRealm() + "'");