diff --git a/cat-consumer/src/test/resources/com/dianping/cat/consumer/problem/model/problem-report.xml b/cat-consumer/src/test/resources/com/dianping/cat/consumer/problem/model/problem-report.xml
index ff72e448ab21af70a2b0d3f2b0d6f29409cced5a..59f099ff67cdfec19afc7ffd3759447b02069c15 100644
--- a/cat-consumer/src/test/resources/com/dianping/cat/consumer/problem/model/problem-report.xml
+++ b/cat-consumer/src/test/resources/com/dianping/cat/consumer/problem/model/problem-report.xml
@@ -1,4 +1,6 @@
+ Cat
+ 192.168.63.66
@@ -44,6 +46,4 @@
- Cat
- 192.168.63.66
diff --git a/cat-core/src/main/java/com/dianping/cat/message/spi/internal/DefaultMessageHandler.java b/cat-core/src/main/java/com/dianping/cat/message/spi/internal/DefaultMessageHandler.java
index 3af28b68a4046582db1ec75f2225f3885d35bc5a..9a73aa722cae5a98b3570bafc29d292e59154a5f 100644
--- a/cat-core/src/main/java/com/dianping/cat/message/spi/internal/DefaultMessageHandler.java
+++ b/cat-core/src/main/java/com/dianping/cat/message/spi/internal/DefaultMessageHandler.java
@@ -46,7 +46,7 @@ public class DefaultMessageHandler extends ContainerHolder implements MessageHan
try {
consumer.consume(tree);
- } catch (Exception e) {
+ } catch (Throwable e) {
m_logger.error("Error when consuming message in " + consumer + "! tree: " + tree, e);
}
}
diff --git a/cat-core/src/main/java/com/dianping/cat/status/StatusInfoCollector.java b/cat-core/src/main/java/com/dianping/cat/status/StatusInfoCollector.java
index b14b30614ade31d1cfe3e5f4d43572525969f764..4eb04188ce7b44be27234c859a49ff977cacc5ea 100644
--- a/cat-core/src/main/java/com/dianping/cat/status/StatusInfoCollector.java
+++ b/cat-core/src/main/java/com/dianping/cat/status/StatusInfoCollector.java
@@ -120,9 +120,11 @@ class StatusInfoCollector extends BaseVisitor {
memory.setNonHeapUsage(bean.getNonHeapMemoryUsage().getUsed());
List beans = ManagementFactory.getGarbageCollectorMXBeans();
+
for (GarbageCollectorMXBean mxbean : beans) {
if (mxbean.isValid()) {
GcInfo gc = new GcInfo();
+
gc.setName(mxbean.getName());
gc.setCount(mxbean.getCollectionCount());
gc.setTime(mxbean.getCollectionTime());
@@ -148,7 +150,7 @@ class StatusInfoCollector extends BaseVisitor {
os.setArch(bean.getArch());
os.setName(bean.getName());
- os.setVersion(bean.getName());
+ os.setVersion(bean.getVersion());
os.setAvailableProcessors(bean.getAvailableProcessors());
os.setSystemLoadAverage(bean.getSystemLoadAverage());