Merge branch 'master' of ssh://192.168.8.22:58422/cat

cat-consumer/src/main/java/com/dianping/cat/consumer/heartbeat/HeartbeatAnalyzer.java

@@ -92,6 +92,7 @@ public class HeartbeatAnalyzer extends AbstractMessageAnalyzer<HeartbeatReport>
 			info = new com.dianping.cat.status.model.transform.DefaultDomParser().parse(xml);
 		} catch (Exception e) {
 			Cat.logError(e);
+			Cat.getProducer().logEvent("HearbeatAnalyzer", "ErrorXml", "Error", xml);
 			return null;
 		}
 

cat-home/src/test/java/com/dianping/cat/demo/TestSendMessage.java

@@ -13,6 +13,7 @@ public class TestSendMessage {
 	public void sendException() throws Exception {
 		for (int i = 0; i < 100; i++) {
 			Cat.getProducer().logError(new OutOfMemoryError());
+			Cat.getProducer().logError(new NullPointerException());
 		}
 		Thread.sleep(1000);
 	}