Author: ggregory Date: Sat Jan 26 16:14:48 2013 New Revision: 1438908 URL: http://svn.apache.org/viewvc?rev=1438908&view=rev Log: [LOG4J2-156] LocalizedMessageTest fails on linux system. Modified: logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/message/LocalizedMessageTest.java logging/log4j/log4j2/trunk/src/changes/changes.xml Modified: logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/message/LocalizedMessageTest.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/message/LocalizedMessageTest.java?rev=1438908&r1=1438907&r2=1438908&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/message/LocalizedMessageTest.java (original) +++ logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/message/LocalizedMessageTest.java Sat Jan 26 16:14:48 2013 @@ -33,7 +33,7 @@ public class LocalizedMessageTest { @Test public void testMessageFormat() { - final LocalizedMessage msg = new LocalizedMessage("MF", new Locale("en_US"), "msg1", new Object[] {"1", "Test"}); + final LocalizedMessage msg = new LocalizedMessage("MF", new Locale("en", "US"), "msg1", new Object[] {"1", "Test"}); final String result = msg.getFormattedMessage(); final String expected = "This is test number 1 with string argument Test."; assertTrue(expected.equals(result)); @@ -42,7 +42,7 @@ public class LocalizedMessageTest { @Test public void testStringFormat() { - final LocalizedMessage msg = new LocalizedMessage("SF", new Locale("en_US"), "msg1", new Object[] {"1", "Test"}); + final LocalizedMessage msg = new LocalizedMessage("SF", new Locale("en", "US"), "msg1", new Object[] {"1", "Test"}); final String result = msg.getFormattedMessage(); final String expected = "This is test number 1 with string argument Test."; assertTrue(expected.equals(result)); Modified: logging/log4j/log4j2/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/changes/changes.xml?rev=1438908&r1=1438907&r2=1438908&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/src/changes/changes.xml (original) +++ logging/log4j/log4j2/trunk/src/changes/changes.xml Sat Jan 26 16:14:48 2013 @@ -22,7 +22,10 @@ - + + + LocalizedMessageTest fails on linux system. + RollingFileAppender's FileRenameAction was throwing a NullPointerException if no directory was specified on the target file name.