From f7535240305f35306d55ee5c07bba76c2544eee3 Mon Sep 17 00:00:00 2001
From: youyong205 <youyong205@126.com>
Date: Sat, 24 May 2014 17:14:22 +0800
Subject: [PATCH] remove unused code

---
 .../com/dianping/cat/consumer/metric/MetricConfigManager.java  | 2 +-
 .../java/com/dianping/cat/report/task/metric/AlertInfo.java    | 2 +-
 .../java/com/dianping/cat/report/task/metric/MetricAlert.java  | 3 +--
 .../java/com/dianping/cat/report/task/metric/SwitchAlert.java  | 1 -
 .../main/java/com/dianping/cat/system/page/config/Handler.java | 1 +
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/cat-consumer-advanced/src/main/java/com/dianping/cat/consumer/metric/MetricConfigManager.java b/cat-consumer-advanced/src/main/java/com/dianping/cat/consumer/metric/MetricConfigManager.java
index 74db4cf34..d4764e855 100644
--- a/cat-consumer-advanced/src/main/java/com/dianping/cat/consumer/metric/MetricConfigManager.java
+++ b/cat-consumer-advanced/src/main/java/com/dianping/cat/consumer/metric/MetricConfigManager.java
@@ -87,7 +87,7 @@ public class MetricConfigManager implements Initializable {
 			m_metricConfig = new MetricConfig();
 		}
 	}
-
+	
 	public boolean insertIfNotExist(String domain, String type, String metricKey, ConfigItem item) {
 		String key = buildMetricKey(domain, type, metricKey);
 		MetricItemConfig config = m_metricConfig.findMetricItemConfig(key);
diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/metric/AlertInfo.java b/cat-home/src/main/java/com/dianping/cat/report/task/metric/AlertInfo.java
index 9901121b2..1d3ad1323 100644
--- a/cat-home/src/main/java/com/dianping/cat/report/task/metric/AlertInfo.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/task/metric/AlertInfo.java
@@ -21,7 +21,7 @@ public class AlertInfo implements Initializable {
 	protected MetricConfigManager m_manager;
 
 	public void addAlertInfo(MetricItemConfig config, long value) {
-		m_alertInfos.putIfAbsent(config, value);
+		m_alertInfos.put(config, value);
 	}
 
 	public List<MetricItemConfig> queryLastestAlarmInfo(int minute) {
diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/metric/MetricAlert.java b/cat-home/src/main/java/com/dianping/cat/report/task/metric/MetricAlert.java
index 117b18637..e38ad0fa4 100644
--- a/cat-home/src/main/java/com/dianping/cat/report/task/metric/MetricAlert.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/task/metric/MetricAlert.java
@@ -181,9 +181,8 @@ public class MetricAlert extends BaseAlert implements Task, LogEnabled {
 		}
 
 		if (alert != null && alert.getKey()) {
-			config.setId(m_metricConfigManager.buildMetricKey(config.getDomain(), config.getType(), config.getMetricKey()));
-
 			m_alertInfo.addAlertInfo(config, new Date().getTime());
+			
 			sendAlertInfo(productLine, config, alert.getValue());
 		}
 	}
diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/metric/SwitchAlert.java b/cat-home/src/main/java/com/dianping/cat/report/task/metric/SwitchAlert.java
index 1a6c345ea..779a5e3d2 100644
--- a/cat-home/src/main/java/com/dianping/cat/report/task/metric/SwitchAlert.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/task/metric/SwitchAlert.java
@@ -123,7 +123,6 @@ public class SwitchAlert extends BaseAlert implements Task, LogEnabled {
 		}
 
 		if (alert != null && alert.getKey()) {
-			config.setId(m_metricConfigManager.buildMetricKey(config.getDomain(), config.getType(), config.getMetricKey()));
 			m_alertInfo.addAlertInfo(config, new Date().getTime());
 			sendAlertInfo(productLine, config, alert.getValue());
 		}
diff --git a/cat-home/src/main/java/com/dianping/cat/system/page/config/Handler.java b/cat-home/src/main/java/com/dianping/cat/system/page/config/Handler.java
index 04468763f..5dd6cc59f 100644
--- a/cat-home/src/main/java/com/dianping/cat/system/page/config/Handler.java
+++ b/cat-home/src/main/java/com/dianping/cat/system/page/config/Handler.java
@@ -416,6 +416,7 @@ public class Handler implements PageHandler<Context> {
 
 		if (!StringUtil.isEmpty(domain) && !StringUtil.isEmpty(type) && !StringUtil.isEmpty(metricKey)) {
 			config.setId(m_metricConfigManager.buildMetricKey(domain, type, metricKey));
+			
 			return m_metricConfigManager.insertMetricItemConfig(config);
 		} else {
 			return false;
-- 
GitLab