svn commit: r1593981 - in /logging/log4j/log4j2/trunk/log4j-core/src: main/java/org/apache/logging/log4j/core/layout/JSONLayout.java test/java/org/apache/logging/log4j/core/layout/JSONLayoutTest.java

[rgoers]

Author: rgoers
Date: Mon May 12 14:43:28 2014
New Revision: 1593981

URL: http://svn.apache.org/r1593981
Log:
LOG4J2-623 - remove erroneous trailing }

Modified:
    
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JSONLayout.java
    
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/JSONLayoutTest.java

Modified: 
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JSONLayout.java
URL: 
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JSONLayout.java?rev=1593981&r1=1593980&r2=1593981&view=diff
==============================================================================
--- 
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JSONLayout.java
 (original)
+++ 
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JSONLayout.java
 Mon May 12 14:43:28 2014
@@ -263,7 +263,7 @@ public class JSONLayout extends Abstract
                 
buf.append(Transform.escapeJsonControlCharacters(entry.getKey()));
                 buf.append("\": \"");
                 
buf.append(Transform.escapeJsonControlCharacters(String.valueOf(entry.getValue())));
-                buf.append("\"}");
+                buf.append("\"");
                 if (i < entrySet.size()) {
                     buf.append(',');
                 }

Modified: 
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/JSONLayoutTest.java
URL: 
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/JSONLayoutTest.java?rev=1593981&r1=1593980&r2=1593981&view=diff
==============================================================================
--- 
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/JSONLayoutTest.java
 (original)
+++ 
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/JSONLayoutTest.java
 Mon May 12 14:43:28 2014
@@ -131,7 +131,7 @@ public class JSONLayoutTest {
         this.checkAt("\"level\":\"DEBUG\",", 4, list);
         this.checkAt("\"message\":\"starting mdc pattern test\",", 6, list);
         this.checkAt("\"Properties\": {", 41, list);
-        this.checkAt("\"key2\": \"value2\"}", list, 42, 43);
+        this.checkAt("\"key2\": \"value2\"", list, 42, 43);
         for (Appender app : appenders.values()) {
             root.addAppender(app);
         }