This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/master by this push:
new 69fff96 [LOG4J2-2618] Possible ClassCastException in
org.apache.logging.log4j.core.script.ScriptManager.ScriptManager(Configuration,
WatchManager).
69fff96 is described below
commit 69fff969043cbeda9c03a23814c39cd7844ef07b
Author: Gary Gregory <[email protected]>
AuthorDate: Thu May 30 07:34:48 2019 -0400
[LOG4J2-2618] Possible ClassCastException in
org.apache.logging.log4j.core.script.ScriptManager.ScriptManager(Configuration,
WatchManager).
---
.../java/org/apache/logging/log4j/core/script/ScriptManager.java | 3 ++-
src/changes/changes.xml | 6 ++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptManager.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptManager.java
index 1d6deaf..a167aa4 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptManager.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptManager.java
@@ -22,6 +22,7 @@ import java.nio.file.Path;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.List;
+import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
@@ -80,7 +81,7 @@ public class ScriptManager implements FileWatcher,
Serializable {
final int factorySize = factories.size();
logger.debug("Installed {} script engine{}", factorySize,
factorySize != 1 ? "s" : Strings.EMPTY);
for (final ScriptEngineFactory factory : factories) {
- String threading = (String)
factory.getParameter(KEY_THREADING);
+ String threading =
Objects.toString(factory.getParameter(KEY_THREADING), null);
if (threading == null) {
threading = "Not Thread Safe";
}
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index e4cbc7e..6678cb1 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -391,6 +391,9 @@
<action issue="LOG4J2-2612" dev="ggregory" type="fix">
NullPointerException at
org.apache.logging.log4j.core.appender.db.jdbc.JdbcDatabaseManager.writeInternal(JdbcDatabaseManager.java:803).
</action>
+ <action issue="LOG4J2-2618" dev="ggregory" type="fix">
+ Possible ClassCastException in
org.apache.logging.log4j.core.script.ScriptManager.ScriptManager(Configuration,
WatchManager)
+ </action>
</release>
<release version="2.12.0" date="2019-MM-DD" description="GA Release
2.12.0">
<action issue="LOG4J2-2561" dev="rgoers" type="fix" due-to="Ulrich
Enslin">
@@ -611,6 +614,9 @@
<action issue="LOG4J2-2533" dev="ckozak" type="fix" due-to="Michail
Prusakov">
Fix a regression introduced by LOG4J2-2301 in 2.11.1 allowing
allocation to occur in AsyncLoggerConfig.
</action>
+ <action issue="LOG4J2-2618" dev="ggregory" type="fix">
+ Possible ClassCastException in
org.apache.logging.log4j.core.script.ScriptManager.ScriptManager(Configuration,
WatchManager)
+ </action>
</release>
<release version="2.11.1" date="2018-07-22" description="GA Release
2.11.1">
<action issue="LOG4J2-2389" dev="rgoers" type="fix" due-to="Liu Wen">
