Author: markt
Date: Tue Jan 12 22:43:23 2010
New Revision: 898558
URL: http://svn.apache.org/viewvc?rev=898558&view=rev
Log:
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
Modified:
tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
Modified: tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java?rev=898558&r1=898557&r2=898558&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java Tue Jan 12
22:43:23 2010
@@ -1929,8 +1929,12 @@
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;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
