Author: kkolinko
Date: Wed Mar 3 16:50:15 2010
New Revision: 918564
URL: http://svn.apache.org/viewvc?rev=918564&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/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=918564&r1=918563&r2=918564&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Wed Mar 3 16:50:15 2010
@@ -140,13 +140,6 @@
+1: markt, kkolinko, rjung
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48516
- Prevent possible NPE in JNDIRealm when user does not exist
- Patch provided by Kevin Conaway
- http://svn.apache.org/viewvc?rev=898558&view=rev
- +1: markt, kkolinko, rjung
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47987
http://svn.apache.org/viewvc?rev=832200&view=rev
Limit size of not found resources cache
Modified:
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java?rev=918564&r1=918563&r2=918564&view=diff
==============================================================================
---
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java
(original)
+++
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java
Wed Mar 3 16:50:15 2010
@@ -1576,8 +1576,12 @@
User user = getUser(context, username);
- return new GenericPrincipal(this, user.username, user.password ,
- getRoles(context, user));
+ if (user != null) {
+ return new GenericPrincipal(this, user.username, user.password,
+ getRoles(context, user));
+ }
+
+ return null;
}
/**
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=918564&r1=918563&r2=918564&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Wed Mar 3
16:50:15 2010
@@ -121,6 +121,10 @@
(kkolinko/markt)
</fix>
<fix>
+ <bug>48516</bug>: Prevent NPE in JNDIRealm if requested user does not
+ exist. Patch provided by Kevin Conaway. (markt)
+ </fix>
+ <fix>
Add an additional permission required by JULI when running under newer
JDKs and a security manager. (markt)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
