From 96abff00a1d4bf22d425782405aa7a5e8f1c8252 Mon Sep 17 00:00:00 2001 From: markt Date: Tue, 12 Jan 2010 22:43:23 +0000 Subject: [PATCH] Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48516 Fix possible NPE when user does not exist in directory Patch provided by Kevin Conaway git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@898558 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/realm/JNDIRealm.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/java/org/apache/catalina/realm/JNDIRealm.java b/java/org/apache/catalina/realm/JNDIRealm.java index bb32f71b0..72a07171c 100644 --- a/java/org/apache/catalina/realm/JNDIRealm.java +++ b/java/org/apache/catalina/realm/JNDIRealm.java @@ -1929,8 +1929,12 @@ public class JNDIRealm extends RealmBase { User user = getUser(context, username); - return new GenericPrincipal(user.username, user.password , - getRoles(context, user)); + if (user != null) { + return new GenericPrincipal(user.username, user.password, + getRoles(context, user)); + } + + return null; } /** -- 2.11.0