modify the event deletegate

cat-consumer/src/main/java/com/dianping/cat/consumer/event/EventDelegate.java

@@ -64,20 +64,6 @@ public class EventDelegate implements ReportDelegate<EventReport> {
 		return xml;
 	}
 
-	@Override
-	public boolean createHourlyTask(EventReport report) {
-		String domain = report.getDomain();
-
-		if (domain.equals(Constants.ALL)) {
-			return m_taskManager.createTask(report.getStartTime(), domain, EventAnalyzer.ID,
-			      TaskProlicy.ALL_EXCLUED_HOURLY);
-		} else if (m_configManager.validateDomain(domain)) {
-			return m_taskManager.createTask(report.getStartTime(), report.getDomain(), EventAnalyzer.ID, TaskProlicy.ALL);
-		} else {
-			return true;
-		}
-	}
-
 	public EventReport createAggregatedReport(Map<String, EventReport> reports) {
 		EventReport first = reports.values().iterator().next();
 		EventReport all = makeReport(Constants.ALL, first.getStartTime().getTime(), Constants.HOUR);
@@ -87,10 +73,12 @@ public class EventDelegate implements ReportDelegate<EventReport> {
 			for (EventReport report : reports.values()) {
 				String domain = report.getDomain();
 
-				all.getIps().add(domain);
-				all.getDomainNames().add(domain);
+				if (!domain.equals(Constants.ALL)) {
+					all.getIps().add(domain);
+					all.getDomainNames().add(domain);
 
-				visitor.visitEventReport(report);
+					visitor.visitEventReport(report);
+				}
 			}
 		} catch (Exception e) {
 			Cat.logError(e);
@@ -98,6 +86,20 @@ public class EventDelegate implements ReportDelegate<EventReport> {
 		return all;
 	}
 
+	@Override
+	public boolean createHourlyTask(EventReport report) {
+		String domain = report.getDomain();
+
+		if (domain.equals(Constants.ALL)) {
+			return m_taskManager.createTask(report.getStartTime(), domain, EventAnalyzer.ID,
+			      TaskProlicy.ALL_EXCLUED_HOURLY);
+		} else if (m_configManager.validateDomain(domain)) {
+			return m_taskManager.createTask(report.getStartTime(), report.getDomain(), EventAnalyzer.ID, TaskProlicy.ALL);
+		} else {
+			return true;
+		}
+	}
+
 	@Override
 	public String getDomain(EventReport report) {
 		return report.getDomain();

cat-consumer/src/main/java/com/dianping/cat/consumer/transaction/TransactionDelegate.java

@@ -75,11 +75,13 @@ public class TransactionDelegate implements ReportDelegate<TransactionReport> {
 		try {
 			for (TransactionReport report : reports.values()) {
 				String domain = report.getDomain();
+				
+				if (!domain.equals(Constants.ALL)) {
+					all.getIps().add(domain);
+					all.getDomainNames().add(domain);
 
-				all.getIps().add(domain);
-				all.getDomainNames().add(domain);
-
-				visitor.visitTransactionReport(report);
+					visitor.visitTransactionReport(report);
+				}
 			}
 		} catch (Exception e) {
 			Cat.logError(e);