From 9d2e60fdc6185801ab98dfe92beefaf408aa426c Mon Sep 17 00:00:00 2001
From: "william.liangf" <william.liangf@1a56cb94-b969-4eaa-88fa-be21384802f2>
Date: Sat, 10 Mar 2012 18:42:35 +0000
Subject: [PATCH] =?UTF-8?q?DUBBO-263=20SimpleMonitor=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E5=BC=82=E6=AD=A5=E5=86=99=E5=85=A5=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://code.alibabatech.com/svn/dubbo/trunk@1241 1a56cb94-b969-4eaa-88fa-be21384802f2
---
 .../com/alibaba/dubbo/monitor/dubbo/DubboMonitor.java |  4 +---
 .../dubbo/monitor/simple/SimpleMonitorService.java    | 11 +++++++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/dubbo-monitor-default/src/main/java/com/alibaba/dubbo/monitor/dubbo/DubboMonitor.java b/dubbo-monitor-default/src/main/java/com/alibaba/dubbo/monitor/dubbo/DubboMonitor.java
index 096eab365f..6be72b26a6 100644
--- a/dubbo-monitor-default/src/main/java/com/alibaba/dubbo/monitor/dubbo/DubboMonitor.java
+++ b/dubbo-monitor-default/src/main/java/com/alibaba/dubbo/monitor/dubbo/DubboMonitor.java
@@ -15,8 +15,6 @@
  */
 package com.alibaba.dubbo.monitor.dubbo;
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
@@ -80,7 +78,7 @@ public class DubboMonitor implements Monitor {
         if (logger.isInfoEnabled()) {
             logger.info("Send statistics to monitor " + getUrl());
         }
-        String timestamp = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
+        String timestamp = String.valueOf(System.currentTimeMillis());
         for (Map.Entry<Statistics, AtomicReference<long[]>> entry : statisticsMap.entrySet()) {
             // 获取已统计数据
             Statistics statistics = entry.getKey();
diff --git a/dubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/SimpleMonitorService.java b/dubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/SimpleMonitorService.java
index bf8c870ba9..3b9614268a 100644
--- a/dubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/SimpleMonitorService.java
+++ b/dubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/SimpleMonitorService.java
@@ -161,8 +161,15 @@ public class SimpleMonitorService implements MonitorService {
         if (POISON_PROTOCOL.equals(statistics.getProtocol())) {
             return;
         }
-        long timestamp = statistics.getParameter(Constants.TIMESTAMP_KEY, System.currentTimeMillis());
-        Date now = new Date(timestamp);
+        String timestamp = statistics.getParameter(Constants.TIMESTAMP_KEY);
+        Date now;
+        if (timestamp == null || timestamp.length() == 0) {
+            now = new Date();
+        } else if (timestamp.length() == "yyyyMMddHHmmss".length()) {
+            now = new SimpleDateFormat("yyyyMMddHHmmss").parse(timestamp);
+        } else {
+            now = new Date(Long.parseLong(timestamp));
+        }
         String day = new SimpleDateFormat("yyyyMMdd").format(now);
         SimpleDateFormat format = new SimpleDateFormat("HHmm");
         for (String key : types) {