Merge branch 'master' of code.dianpingoa.com:arch/cat

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

@@ -65,25 +65,29 @@ public class EventDelegate implements ReportDelegate<EventReport> {
 	}
 
 	public EventReport createAggregatedReport(Map<String, EventReport> reports) {
-		EventReport first = reports.values().iterator().next();
-		EventReport all = makeReport(Constants.ALL, first.getStartTime().getTime(), Constants.HOUR);
-		EventReportTypeAggregator visitor = new EventReportTypeAggregator(all, m_allManager);
+		if (reports.size() > 0) {
+			EventReport first = reports.values().iterator().next();
+			EventReport all = makeReport(Constants.ALL, first.getStartTime().getTime(), Constants.HOUR);
+			EventReportTypeAggregator visitor = new EventReportTypeAggregator(all, m_allManager);
 
-		try {
-			for (EventReport report : reports.values()) {
-				String domain = report.getDomain();
+			try {
+				for (EventReport report : reports.values()) {
+					String domain = report.getDomain();
 
-				if (!domain.equals(Constants.ALL)) {
-					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);
 			}
-		} catch (Exception e) {
-			Cat.logError(e);
+			return all;
+		} else {
+			return new EventReport(Constants.ALL);
 		}
-		return all;
 	}
 
 	@Override

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

@@ -68,25 +68,29 @@ public class TransactionDelegate implements ReportDelegate<TransactionReport> {
 	}
 
 	public TransactionReport createAggregatedReport(Map<String, TransactionReport> reports) {
-		TransactionReport first = reports.values().iterator().next();
-		TransactionReport all = makeReport(ALL, first.getStartTime().getTime(), Constants.HOUR);
-		TransactionReportTypeAggregator visitor = new TransactionReportTypeAggregator(all, m_transactionManager);
-
-		try {
-			for (TransactionReport report : reports.values()) {
-				String domain = report.getDomain();
-				
-				if (!domain.equals(Constants.ALL)) {
-					all.getIps().add(domain);
-					all.getDomainNames().add(domain);
-
-					visitor.visitTransactionReport(report);
+		if (reports.size() > 0) {
+			TransactionReport first = reports.values().iterator().next();
+			TransactionReport all = makeReport(ALL, first.getStartTime().getTime(), Constants.HOUR);
+			TransactionReportTypeAggregator visitor = new TransactionReportTypeAggregator(all, m_transactionManager);
+
+			try {
+				for (TransactionReport report : reports.values()) {
+					String domain = report.getDomain();
+
+					if (!domain.equals(Constants.ALL)) {
+						all.getIps().add(domain);
+						all.getDomainNames().add(domain);
+
+						visitor.visitTransactionReport(report);
+					}
 				}
+			} catch (Exception e) {
+				Cat.logError(e);
 			}
-		} catch (Exception e) {
-			Cat.logError(e);
+			return all;
+		} else {
+			return new TransactionReport(ALL);
 		}
-		return all;
 	}
 
 	@Override