diff --git a/cat-consumer/src/main/java/com/dianping/cat/consumer/failure/FailureReportAnalyzer.java b/cat-consumer/src/main/java/com/dianping/cat/consumer/failure/FailureReportAnalyzer.java index 5c4dd2a742365b9e6a204da14aa0cff37b6f7e96..8b2c06c0988f290e088fbfc850ac2f36372b515b 100644 --- a/cat-consumer/src/main/java/com/dianping/cat/consumer/failure/FailureReportAnalyzer.java +++ b/cat-consumer/src/main/java/com/dianping/cat/consumer/failure/FailureReportAnalyzer.java @@ -179,8 +179,8 @@ public class FailureReportAnalyzer extends AbstractMessageAnalyzer entry : newSegments.entrySet()) { + oldSegments.put(entry.getKey(), newSegments.get(entry.getValue())); } return m_report; } diff --git a/cat-home/src/main/java/com/dianping/cat/report/ReportManager.java b/cat-home/src/main/java/com/dianping/cat/report/ReportManager.java index 48773945d5916105756a47ec9fccc09c1ee7a3b3..ca1510a8f64bf0e7b9afd9d0107d61bca5d89f1a 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/ReportManager.java +++ b/cat-home/src/main/java/com/dianping/cat/report/ReportManager.java @@ -47,8 +47,6 @@ public abstract class ReportManager { } catch (ParseException e) { e.printStackTrace(); } - } else { - inputStart = DateUtils.SDF_URL.format(currentHourStart); } long reportStart = startLong + changeValue * DateUtils.HOUR; diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/service/provider/TransactionModelProvider.java b/cat-home/src/main/java/com/dianping/cat/report/page/service/provider/TransactionModelProvider.java index cf71bbaaca25ca028918a59f19e982f844538282..dec7ffe9bddb7603db91105bc6acc07c7ef9f534 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/service/provider/TransactionModelProvider.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/service/provider/TransactionModelProvider.java @@ -49,8 +49,13 @@ public class TransactionModelProvider implements ModelProvider { } else if (index.equals(Constants.MEMORY_LAST)) { analyzer = (TransactionReportAnalyzer) m_consumer.getLastAnalyzer("transaction"); } + TransactionReport report; - TransactionReport report = analyzer.generate(domain); + if (analyzer == null) { + report = new TransactionReport(domain); + } else { + report = analyzer.generate(domain); + } return new DefaultXmlBuilder().buildXml(report); }