You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2021/11/24 18:07:43 UTC
[tomcat] branch main updated: Fix BZ 65684 - avoid NPE
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new f608410 Fix BZ 65684 - avoid NPE
f608410 is described below
commit f608410811cbfff0df9c5d584c99d161ff7ee527
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Nov 24 17:53:14 2021 +0000
Fix BZ 65684 - avoid NPE
https://bz.apache.org/bugzilla/show_bug.cgi?id=65684
---
java/org/apache/juli/ClassLoaderLogManager.java | 21 +++++++++++----------
webapps/docs/changelog.xml | 4 ++++
2 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/java/org/apache/juli/ClassLoaderLogManager.java b/java/org/apache/juli/ClassLoaderLogManager.java
index 0882c85..91d8871 100644
--- a/java/org/apache/juli/ClassLoaderLogManager.java
+++ b/java/org/apache/juli/ClassLoaderLogManager.java
@@ -280,24 +280,25 @@ public class ClassLoaderLogManager extends LogManager {
private synchronized String findProperty(String name) {
- ClassLoader classLoader = Thread.currentThread()
- .getContextClassLoader();
+ ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
ClassLoaderLogInfo info = getClassLoaderInfo(classLoader);
String result = info.props.getProperty(name);
// If the property was not found, and the current classloader had no
// configuration (property list is empty), look for the parent classloader
// properties.
if ((result == null) && (info.props.isEmpty())) {
- ClassLoader current = classLoader.getParent();
- while (current != null) {
- info = classLoaderLoggers.get(current);
- if (info != null) {
- result = info.props.getProperty(name);
- if ((result != null) || (!info.props.isEmpty())) {
- break;
+ if (classLoader != null) {
+ ClassLoader current = classLoader.getParent();
+ while (current != null) {
+ info = classLoaderLoggers.get(current);
+ if (info != null) {
+ result = info.props.getProperty(name);
+ if ((result != null) || (!info.props.isEmpty())) {
+ break;
+ }
}
+ current = current.getParent();
}
- current = current.getParent();
}
if (result == null) {
result = super.getProperty(name);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 54b8758..e77ab39 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -127,6 +127,10 @@
Limit cookie support to RFC 6265 to align with recent updates to the
Servlet specification. (markt)
</fix>
+ <fix>
+ <bug>65684</bug>: Fix a potential <code>NullPointerException</code> when
+ using JULI. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org