INT-1708, INT-1709 added error-channel to the poller

spring-integration-core/src/main/java/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBean.java

@@ -130,7 +130,7 @@ public class SourcePollingChannelAdapterFactoryBean implements FactoryBean<Sourc
 				this.pollerMetadata.setMaxMessagesPerPoll(1);
 			}
 			spca.setPollerMetadata(this.pollerMetadata);
-			
+			spca.setErrorHandler(this.pollerMetadata.getErrorHandler());
 			spca.setBeanClassLoader(this.beanClassLoader);
 			spca.setAutoStartup(this.autoStartup);
 			spca.setBeanName(this.beanName);

spring-integration-core/src/main/java/org/springframework/integration/config/xml/PollerParser.java

@@ -99,6 +99,14 @@ public class PollerParser extends AbstractBeanDefinitionParser {
 		configureAdviceChain(adviceChainElement, txElement, metadataBuilder, parserContext);
 		
 		IntegrationNamespaceUtils.setReferenceIfAttributeDefined(metadataBuilder, element, "task-executor");
+		String errorChannel = element.getAttribute("error-channel");
+		if (StringUtils.hasText(errorChannel)){
+			BeanDefinitionBuilder errorHandler = BeanDefinitionBuilder.genericBeanDefinition(
+					"org.springframework.integration.channel.MessagePublishingErrorHandler");
+			errorHandler.addPropertyReference("defaultErrorChannel", errorChannel);
+			
+			metadataBuilder.addPropertyValue("errorHandler", errorHandler.getBeanDefinition());
+		}
 		return metadataBuilder.getBeanDefinition();
 	}
 

spring-integration-core/src/main/java/org/springframework/integration/scheduling/PollerMetadata.java

@@ -22,6 +22,7 @@ import java.util.concurrent.Executor;
 import org.aopalliance.aop.Advice;
 import org.springframework.scheduling.Trigger;
 import org.springframework.scheduling.support.PeriodicTrigger;
+import org.springframework.util.ErrorHandler;
 
 /**
  * @author Mark Fisher
@@ -36,6 +37,8 @@ public class PollerMetadata {
 	private volatile long maxMessagesPerPoll = MAX_MESSAGES_UNBOUNDED;
 
 	private volatile long receiveTimeout = 1000;
+	
+	private volatile ErrorHandler errorHandler;
 
 	private List<Advice> adviceChain;
 
@@ -48,6 +51,14 @@ public class PollerMetadata {
 	public Trigger getTrigger() {
 		return this.trigger;
 	}
+	
+	public ErrorHandler getErrorHandler() {
+		return errorHandler;
+	}
+
+	public void setErrorHandler(ErrorHandler errorHandler) {
+		this.errorHandler = errorHandler;
+	}
 
 	/**
 	 * Set the maximum number of messages to receive for each poll.

spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.0.xsd

@@ -1242,6 +1242,15 @@ endpoint itself is a Polling Consumer for a channel with a queue.
 				</xsd:appinfo>
 			</xsd:annotation>
 		</xsd:attribute>
+		<xsd:attribute name="error-channel" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+					Identifies channel that error messages will be sent to if a failure occurs in this
+					poller's invocation. To completely suppress Exceptions, provide a
+					reference to the "nullChannel" here.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
 	</xsd:complexType>
 
 	<xsd:complexType name="intervalTriggerType">