From c264de9c9345c6526a0f1f16088ffaf0bbefaf12 Mon Sep 17 00:00:00 2001
From: Li Zhanhui <lizhanhui@gmail.com>
Date: Tue, 22 May 2018 20:12:00 +0800
Subject: [PATCH] Format output

---
 .../command/consumer/ConsumerProgressSubCommand.java      | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tools/src/main/java/org/apache/rocketmq/tools/command/consumer/ConsumerProgressSubCommand.java b/tools/src/main/java/org/apache/rocketmq/tools/command/consumer/ConsumerProgressSubCommand.java
index 75296014..a1b3c1a2 100644
--- a/tools/src/main/java/org/apache/rocketmq/tools/command/consumer/ConsumerProgressSubCommand.java
+++ b/tools/src/main/java/org/apache/rocketmq/tools/command/consumer/ConsumerProgressSubCommand.java
@@ -129,7 +129,11 @@ public class ConsumerProgressSubCommand implements SubCommand {
                     diffTotal += diff;
                     String lastTime = "";
                     try {
-                        lastTime = UtilAll.formatDate(new Date(offsetWrapper.getLastTimestamp()), UtilAll.YYYY_MM_DD_HH_MM_SS);
+                        if (offsetWrapper.getLastTimestamp() == 0) {
+                            lastTime = "N/A";
+                        } else {
+                            lastTime = UtilAll.formatDate(new Date(offsetWrapper.getLastTimestamp()), UtilAll.YYYY_MM_DD_HH_MM_SS);
+                        }
                     } catch (Exception e) {
                     }
 
@@ -144,7 +148,7 @@ public class ConsumerProgressSubCommand implements SubCommand {
                         mq.getQueueId(),
                         offsetWrapper.getBrokerOffset(),
                         offsetWrapper.getConsumerOffset(),
-                        null != clientIP ? clientIP : "NA",
+                        null != clientIP ? clientIP : "N/A",
                         diff,
                         lastTime
                     );
-- 
GitLab