From e2c1616d864e0ef1e53fe0f9909162daa0e17bb2 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@vmware.com>
Date: Wed, 6 Oct 2010 11:27:09 -0700
Subject: [PATCH] INT-1449: fix broken message count in message source monitor

---
 .../integration/monitor/SimpleMessageSourceMonitor.java      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/SimpleMessageSourceMonitor.java b/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/SimpleMessageSourceMonitor.java
index c54508eda1..863b00caba 100644
--- a/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/SimpleMessageSourceMonitor.java
+++ b/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/SimpleMessageSourceMonitor.java
@@ -65,10 +65,11 @@ public class SimpleMessageSourceMonitor implements MethodInterceptor, MessageSou
 
 	public Object invoke(MethodInvocation invocation) throws Throwable {
 		String method = invocation.getMethod().getName();
-		if ("receive".equals(method)) {
+		Object result = invocation.proceed();
+		if ("receive".equals(method) && result!=null) {
 			messageCount.incrementAndGet();
 		}
-		return invocation.proceed();
+		return result;
 	}
 
 	@Override