Merge pull request #14 from taosdata/dev/zyyang

fix: nullPointerException
taosdata · Feb 29, 2024 · 1b7c34f · 1b7c34f
2 parents b653f2e + 7b78f15
commit 1b7c34f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/main/java/com/taosdata/demo/util/TimestampUtil.java b/src/main/java/com/taosdata/demo/util/TimestampUtil.java
@@ -28,7 +28,7 @@ public static String format(Object ts, String precision) {
         if (ts instanceof Timestamp) {
             return format((Timestamp) ts, precision);
         }
-        return ts.toString();
+        return String.valueOf(ts);
     }
 
     public static String format(Timestamp ts, String precision) {

diff --git a/src/test/java/com/taosdata/demo/util/TimestampUtilTest.java b/src/test/java/com/taosdata/demo/util/TimestampUtilTest.java
@@ -42,6 +42,10 @@ public void testFormatObject() {
 
         actual = TimestampUtil.format(ts3, "ns");
         assertEquals("2023-03-08 11:34:09.579123456", actual);
+
+        Object a = null;
+        actual = TimestampUtil.format(a, "ms");
+        assertEquals("null", actual);
     }
 
     @Test