From commits-return-43698-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Wed Nov 4 08:25:31 2015 Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-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 F1AAF18C23 for ; Wed, 4 Nov 2015 08:25:28 +0000 (UTC) Received: (qmail 33233 invoked by uid 500); 4 Nov 2015 08:25:28 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 32929 invoked by uid 500); 4 Nov 2015 08:25:28 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 32114 invoked by uid 99); 4 Nov 2015 08:25:27 -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; Wed, 04 Nov 2015 08:25:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B7B10E03EC; Wed, 4 Nov 2015 08:25:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: plusplusjiajia@apache.org To: commits@directory.apache.org Date: Wed, 04 Nov 2015 08:25:50 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [24/48] directory-kerby git commit: Avoid NPE Avoid NPE Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/6ad69847 Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/6ad69847 Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/6ad69847 Branch: refs/heads/pkinit-support Commit: 6ad6984761eb3c40f40e03eb6475a8fbeb58f6bd Parents: b283dec Author: Colm O hEigeartaigh Authored: Wed Sep 30 12:21:53 2015 +0200 Committer: Colm O hEigeartaigh Committed: Wed Sep 30 14:54:31 2015 +0200 ---------------------------------------------------------------------- .../org/apache/kerby/kerberos/kerb/spec/base/PrincipalName.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/6ad69847/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/PrincipalName.java ---------------------------------------------------------------------- diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/PrincipalName.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/PrincipalName.java index 65cbe36..4bf6e0f 100644 --- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/PrincipalName.java +++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/PrincipalName.java @@ -180,6 +180,9 @@ public class PrincipalName extends KrbSequenceType { } private void fromNameString(String nameString) { + if (nameString == null) { + return; + } String tmpRealm = null; List nameStrings; int pos = nameString.indexOf('@');