Merge pull request #322 from jamezp/LOGMGR-281

[LOGMGR-281] Match the nesting and labeling of the fix introduced in …
jboss-logging · Nov 20, 2020 · 4b94ac1 · 4b94ac1
2 parents 2187390 + 0af26a3
commit 4b94ac1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/core/src/main/java/org/jboss/logmanager/formatters/StackTraceFormatter.java b/core/src/main/java/org/jboss/logmanager/formatters/StackTraceFormatter.java
@@ -117,7 +117,9 @@ private void renderStackTrace(final Throwable t) {
 
     private void renderStackTrace(final StackTraceElement[] parentStack, final Throwable child, final String caption, final String prefix) {
         if (seen.contains(child)) {
-            builder.append("\t[CIRCULAR REFERENCE:")
+            builder.append(prefix)
+                    .append(caption)
+                    .append("[CIRCULAR REFERENCE: ")
                     .append(child)
                     .append(']');
             newLine();

diff --git a/core/src/main/java9/org/jboss/logmanager/formatters/StackTraceFormatter.java b/core/src/main/java9/org/jboss/logmanager/formatters/StackTraceFormatter.java
@@ -95,7 +95,9 @@ private void renderStackTrace(final Throwable t) {
 
     private void renderStackTrace(final StackTraceElement[] parentStack, final Throwable child, final String caption, final String prefix) {
         if (seen.contains(child)) {
-            builder.append("\t[CIRCULAR REFERENCE:")
+            builder.append(prefix)
+                    .append(caption)
+                    .append("[CIRCULAR REFERENCE: ")
                     .append(child)
                     .append(']');
             newLine();

diff --git a/core/src/test/java/org/jboss/logmanager/formatters/PatternFormatterTests.java b/core/src/test/java/org/jboss/logmanager/formatters/PatternFormatterTests.java
@@ -245,7 +245,7 @@ public void extendedThrowable() throws Exception {
         formatter = new PatternFormatter("%e");
         cause.addSuppressed(suppressedLevel1);
         formatted = formatter.format(record);
-        Assert.assertTrue(formatted.contains("CIRCULAR REFERENCE:java.lang.IllegalStateException: suppressedLevel1"));
+        Assert.assertTrue(formatted.contains("CIRCULAR REFERENCE: java.lang.IllegalStateException: suppressedLevel1"));
     }
 
     @Test