Skip to content

Commit 9326785

Browse files
committed
Fix format error when last argument is Throwable
1 parent 04b9c4b commit 9326785

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

clickhouse-client/src/main/java/com/clickhouse/client/logging/LogMessage.java

-5
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,6 @@ public static LogMessage of(Object format, Object... arguments) {
2323
Object lastArg = arguments[len - 1];
2424
if (lastArg instanceof Throwable) {
2525
t = (Throwable) lastArg;
26-
if (--len > 0) {
27-
Object[] args = new Object[len];
28-
System.arraycopy(arguments, 0, args, 0, len);
29-
arguments = args;
30-
}
3126
}
3227

3328
if (len > 0) {

clickhouse-client/src/test/java/com/clickhouse/client/logging/LogMessageTest.java

+8
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,13 @@ public void testMessageWithThrowable() {
3737
msg = LogMessage.of("test %s", 1, t);
3838
Assert.assertEquals("test 1", msg.getMessage());
3939
Assert.assertEquals(t, msg.getThrowable());
40+
41+
msg = LogMessage.of("test %d %s", 1, t);
42+
Assert.assertEquals("test 1 java.lang.Exception", msg.getMessage());
43+
Assert.assertEquals(t, msg.getThrowable());
44+
45+
msg = LogMessage.of("test %d %s", 1, t, null);
46+
Assert.assertEquals("test 1 java.lang.Exception", msg.getMessage());
47+
Assert.assertEquals(msg.getThrowable(), null);
4048
}
4149
}

0 commit comments

Comments
 (0)