fix: stringutils stackoverflowerror. (apache#2427)

nimenhao · Mar 20, 2020 · abd96c1 · abd96c1
1 parent 7b796c3
commit abd96c1
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/common/src/main/java/io/seata/common/util/StringUtils.java b/common/src/main/java/io/seata/common/util/StringUtils.java
@@ -220,7 +220,11 @@ public static String toString(Object obj) {
             sb.append("=");
             try {
                 Object f = field.get(obj);
-                sb.append(toString(f));
+                if (f.getClass() == obj.getClass()) {
+                    sb.append(f.toString());
+                } else {
+                    sb.append(toString(f));
+                }
             } catch (Exception e) {
             }
             sb.append(";");

diff --git a/common/src/test/java/io/seata/common/util/StringUtilsTest.java b/common/src/test/java/io/seata/common/util/StringUtilsTest.java
@@ -87,4 +87,31 @@ void testEqualsIgnoreCase() {
         Assertions.assertFalse(StringUtils.equalsIgnoreCase("", null));
         Assertions.assertFalse(StringUtils.equalsIgnoreCase(null, ""));
     }
+
+    @Test
+    void testCycleDependency() {
+        CycleDependency A = CycleDependency.A;
+        try {
+            StringUtils.toString(A);
+        } catch (StackOverflowError e) {
+            Assertions.fail("stack overflow error");
+        }
+    }
+
+    static class CycleDependency {
+        public static final CycleDependency A = new CycleDependency("a");
+        public static final CycleDependency B = new CycleDependency("b");
+
+        private String s;
+        private CycleDependency(String s) {
+            this.s = s;
+        }
+
+        @Override
+        public String toString() {
+            return "{" +
+                    "s='" + s + '\'' +
+                    '}';
+        }
+    }
 }