ARTEMIS-3621 show 'zero' timestamp as 'N/A' (instead of 1970...)

apache · Jan 4, 2022 · 9b45055 · 9b45055
1 parent 055d05b
commit 9b45055
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/browse.js b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/browse.js
@@ -481,7 +481,7 @@ var Artemis;
                    // "HH:mm:ss ago"
                    return hours + ":" + mins + ":" + secs + " ago";
                 }
-                // "in HH:mm:ss ago"
+                // "in HH:mm:ss"
                 return "in " + hours + ":" + mins + ":" + secs;
              }
              return formatTimestamp(timestamp);
@@ -491,6 +491,9 @@ var Artemis;
              if (isNaN(timestamp) || typeof timestamp !== "number") {
                 return timestamp;
              }
+             if (timestamp === 0) {
+                return "N/A";
+             }
              var d = new Date(timestamp);
              // "yyyy-MM-dd HH:mm:ss"
              //add 1 to month as getmonth returns the position not the actual month
@@ -526,7 +529,7 @@ var Artemis;
         }
 
         function formatPersistentSize(bytes) {
-            if(isNaN(bytes) || typeof bytes !== "number" || bytes < 0) return "n/a";
+            if(isNaN(bytes) || typeof bytes !== "number" || bytes < 0) return "N/A";
             if(bytes < 10240) return bytes.toLocaleString() + " Bytes";
             if(bytes < 1048576) return (bytes / 1024).toFixed(2) + " KB";
             if(bytes < 1073741824) return (bytes / 1048576).toFixed(2) + " MB";