You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2020/02/08 22:27:59 UTC
[logging-log4j2] branch release-2.x updated (d3c5919 -> b663e7c)
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a change to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git.
from d3c5919 LOG4J2-2759 - RollingFileAppender was not rolling on startup if createOnDemand was set to true.
new 50322a6 Log4j 2LOG4J2-2770 Fix NPE in JMX reconfiguration (#337)
new b663e7c LOG4J2-2770 - changes.xml
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/logging/log4j/core/config/ConfigurationSource.java | 3 +++
src/changes/changes.xml | 3 +++
2 files changed, 6 insertions(+)
[logging-log4j2] 02/02: LOG4J2-2770 - changes.xml
Posted by rg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit b663e7c263469ff25a699def907d33bff52be6f1
Author: Ralph Goers <rg...@apache.org>
AuthorDate: Sat Feb 8 15:27:31 2020 -0700
LOG4J2-2770 - changes.xml
---
src/changes/changes.xml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 2eafcb8..91efddd 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -30,6 +30,9 @@
- "remove" - Removed
-->
<release version="2.13.1" date="2019-MM-DD" description="GA Release 2.13.1">
+ <action issue="LOG4J2-2770" dev="rgoers" type="fix" due-to="Bill Kuker">
+ Fixed NullPointerException after reconfiguring via JMX.
+ </action>
<action issue="LOG4J2-2759" dev="rgoers" type="fix">
RollingFileAppender was not rolling on startup if createOnDemand was set to true.
</action>
[logging-log4j2] 01/02: Log4j 2LOG4J2-2770 Fix NPE in JMX
reconfiguration (#337)
Posted by rg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 50322a666422a89d9523e69b608f6ae3fa2245a2
Author: Bill Kuker <bk...@billkuker.com>
AuthorDate: Sat Feb 8 17:19:22 2020 -0500
Log4j 2LOG4J2-2770 Fix NPE in JMX reconfiguration (#337)
* Update ConfigurationSource.java
I think this needs to store the data so that resetInputStream() works.
The jmx function LoggerContextAdmin::getConfigText throws a NPE if you have previously called LoggerContextAdmin::setConfigText
* Do not set data if URL is provided
Avoids changing behavior of resetInputStream in cases that currently
work correctly.
---
.../java/org/apache/logging/log4j/core/config/ConfigurationSource.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java
index 431d136..44dab54 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java
@@ -149,6 +149,9 @@ public class ConfigurationSource {
this.url = url;
this.location = null;
this.lastModified = lastModified;
+ if ( url == null ) {
+ this.data = data;
+ }
}
/**