Author: rpopma
Date: Mon Jan 13 22:01:07 2014
New Revision: 1557871

URL: http://svn.apache.org/r1557871
Log:
LOG4J2-492 additional fix to handle line feed and carriage return characters in 
ObjectName value

Modified:
    
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/jmx/ServerTest.java

Modified: 
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/jmx/ServerTest.java
URL: 
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/jmx/ServerTest.java?rev=1557871&r1=1557870&r2=1557871&view=diff
==============================================================================
--- 
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/jmx/ServerTest.java
 (original)
+++ 
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/jmx/ServerTest.java
 Mon Jan 13 22:01:07 2014
@@ -104,7 +104,7 @@ public class ServerTest {
     public void testEscapeEscapesLineFeed() throws Exception {
         final String ctx = "a\rc";
         final String ctxName = Server.escape(ctx);
-//        assertEquals("a\\rc", ctxName);
+        assertEquals("a\\rc", ctxName);
         new ObjectName(String.format(LoggerContextAdminMBean.PATTERN, 
ctxName)); 
         // no MalformedObjectNameException = success
     }
@@ -113,7 +113,7 @@ public class ServerTest {
     public void testEscapeEscapesCarriageReturn() throws Exception {
         final String ctx = "a\nc";
         final String ctxName = Server.escape(ctx);
-//        assertEquals("a\\nc", ctxName);
+        assertEquals("a\\nc", ctxName);
         new ObjectName(String.format(LoggerContextAdminMBean.PATTERN, 
ctxName)); 
         // no MalformedObjectNameException = success
     }


Reply via email to