From 734c3e504a872965fa669074184cdbae759cab20 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Tue, 1 Feb 2011 16:41:10 -0500
Subject: [PATCH] INT-1772 polishing

---
 .../config/SourcePollingChannelAdapterFactoryBean.java      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBean.java b/spring-integration-core/src/main/java/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBean.java
index 3f084c80ea..0eb8304df0 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBean.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBean.java
@@ -48,7 +48,7 @@ public class SourcePollingChannelAdapterFactoryBean implements FactoryBean<Sourc
 
 	private volatile boolean autoStartup = true;
 	
-	private volatile long sendTimeout = -1;
+	private volatile Long sendTimeout;
 
 	private volatile String beanName;
 
@@ -136,7 +136,9 @@ public class SourcePollingChannelAdapterFactoryBean implements FactoryBean<Sourc
 				this.pollerMetadata.setMaxMessagesPerPoll(1);
 			}
 			spca.setMaxMessagesPerPoll(this.pollerMetadata.getMaxMessagesPerPoll());
-			spca.setSendTimeout(this.sendTimeout);
+			if (this.sendTimeout != null){
+				spca.setSendTimeout(this.sendTimeout);
+			}		
 			spca.setTaskExecutor(this.pollerMetadata.getTaskExecutor());
 			spca.setAdviceChain(this.pollerMetadata.getAdviceChain());
 			spca.setTrigger(this.pollerMetadata.getTrigger());