LOG4J2-2850 : LocalizedMessageFactory creates new message with baseName as messagePattern
Added test cases
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/message/LocalizedMessageFactoryTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/message/LocalizedMessageFactoryTest.java
index 1e49a6f..b977a18 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/message/LocalizedMessageFactoryTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/message/LocalizedMessageFactoryTest.java
@@ -35,4 +35,12 @@
final Message message = localizedMessageFactory.newMessage("hello_world");
assertEquals("Hello world.", message.getFormattedMessage());
}
+
+ @Test
+ public void testNewMessageUsingBaseName() {
+ final LocalizedMessageFactory localizedMessageFactory = new LocalizedMessageFactory("MF");
+ final String testMsg = "hello_world";
+ final Message message = localizedMessageFactory.newMessage(testMsg);
+ assertEquals("Hello world.", message.getFormattedMessage());
+ }
}
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/message/LocalizedMessageTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/message/LocalizedMessageTest.java
index 019bd69..918e93d 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/message/LocalizedMessageTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/message/LocalizedMessageTest.java
@@ -90,4 +90,11 @@
final String actual = msg.getFormattedMessage();
assertEquals("Test message abc", actual, "Should use initial param value");
}
+
+ @Test
+ public void testMessageUsingBaseName() { // LOG4J2-2850
+ final String testMsg = "hello_world";
+ final LocalizedMessage msg = new LocalizedMessage("MF", testMsg, null);
+ assertEquals("Hello world.", msg.getFormattedMessage());
+ }
}
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 8418044..6264f1b 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -277,6 +277,9 @@
<action issue="LOG4J2-2954" dev="ckozak" type="fix" due-to="Henry Tung">
Prevent premature garbage collection of shutdown hooks in DefaultShutdownCallbackRegistry.
</action>
+ <action issue="LOG4J2-2850" dev="sandeepbarnwal" type="fix">
+ Fix incorrect constructor call in LocalizedMessageFactory.
+ </action>
</release>
<release version="2.13.3" date="2020-05-10" description="GA Release 2.13.3">
<action issue="LOG4J2-2838" dev="rgoers" type="fix">
