remm 2004/02/29 04:38:47
Modified: catalina/src/share/org/apache/catalina/realm
JAASCallbackHandler.java
Log:
- Bug 27276: Fix NPE when a null password is set.
- Submitted by Rohan Lenard.
Revision Changes Path
1.3 +8 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/JAASCallbackHandler.java
Index: JAASCallbackHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/JAASCallbackHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JAASCallbackHandler.java 27 Feb 2004 14:58:45 -0000 1.2
+++ JAASCallbackHandler.java 29 Feb 2004 12:38:47 -0000 1.3
@@ -107,8 +107,14 @@
} else if (callbacks[i] instanceof PasswordCallback) {
if (realm.getDebug() >= 3)
realm.log("Returning password " + password);
+ final char[] passwordcontents;
+ if (password != null) {
+ passwordcontents = password.toCharArray();
+ } else {
+ passwordcontents = new char[0];
+ }
((PasswordCallback) callbacks[i]).setPassword
- (password.toCharArray());
+ (passwordcontents);
} else {
throw new UnsupportedCallbackException(callbacks[i]);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
