Fix format error when last argument is Throwable

ClickHouse · Jul 15, 2022 · 9326785 · 9326785
1 parent 04b9c4b
commit 9326785
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/clickhouse-client/src/main/java/com/clickhouse/client/logging/LogMessage.java b/clickhouse-client/src/main/java/com/clickhouse/client/logging/LogMessage.java
@@ -23,11 +23,6 @@ public static LogMessage of(Object format, Object... arguments) {
             Object lastArg = arguments[len - 1];
             if (lastArg instanceof Throwable) {
                 t = (Throwable) lastArg;
-                if (--len > 0) {
-                    Object[] args = new Object[len];
-                    System.arraycopy(arguments, 0, args, 0, len);
-                    arguments = args;
-                }
             }
 
             if (len > 0) {

diff --git a/clickhouse-client/src/test/java/com/clickhouse/client/logging/LogMessageTest.java b/clickhouse-client/src/test/java/com/clickhouse/client/logging/LogMessageTest.java
@@ -37,5 +37,13 @@ public void testMessageWithThrowable() {
         msg = LogMessage.of("test %s", 1, t);
         Assert.assertEquals("test 1", msg.getMessage());
         Assert.assertEquals(t, msg.getThrowable());
+
+        msg = LogMessage.of("test %d %s", 1, t);
+        Assert.assertEquals("test 1 java.lang.Exception", msg.getMessage());
+        Assert.assertEquals(t, msg.getThrowable());
+
+        msg = LogMessage.of("test %d %s", 1, t, null);
+        Assert.assertEquals("test 1 java.lang.Exception", msg.getMessage());
+        Assert.assertEquals(msg.getThrowable(), null);
     }
 }