Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-1451, formatting

Browse Source
This commit is contained in:
Oleg Zhurakousky
2010-09-26 06:58:52 -04:00
parent 2b2f06aafb
commit 32595009f2
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java
View File

@@ -23,7 +23,6 @@ import org.aopalliance.aop.Advice;
import org.springframework.aop.Advisor;
import org.springframework.aop.framework.ProxyFactory;
import org.springframework.beans.factory.BeanClassLoaderAware;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.core.task.SyncTaskExecutor;
import org.springframework.core.task.TaskExecutor;
import org.springframework.integration.MessageHandlingException;
@@ -71,12 +70,15 @@ public abstract class AbstractPollingEndpoint extends AbstractEndpoint implement
if (this.initialized) {
return;
}
Assert.notNull(this.pollerMetadata.getTrigger(), "trigger is required");
Assert.notNull(this.getBeanFactory(), "BeanFactory must be provided");
TaskExecutor executor = pollerMetadata.getTaskExecutor();
if (executor != null){
taskExecutor = executor;
}
if (taskExecutor != null){
if (!(taskExecutor instanceof ErrorHandlingTaskExecutor)) {
if (errorHandler == null) {
@@ -89,7 +91,8 @@ public abstract class AbstractPollingEndpoint extends AbstractEndpoint implement
try {
this.poller = this.createPoller();
this.initialized = true;
} catch (Exception e) {
}
catch (Exception e) {
throw new MessagingException("Failed to create Poller", e);
}
}
@@ -97,11 +100,13 @@ public abstract class AbstractPollingEndpoint extends AbstractEndpoint implement
@SuppressWarnings("unchecked")
private Runnable createPoller() throws Exception{
Callable<Boolean> pollingTask = new Callable<Boolean>() {
public Boolean call() throws Exception {
return doPoll();
}
};
Advisor transactionAdvice = this.pollerMetadata.getTransactionAdvisor();
List<Advice> adviceChain = this.pollerMetadata.getAdviceChain();
if (transactionAdvice != null || !CollectionUtils.isEmpty(adviceChain)){
@@ -182,10 +187,12 @@ public abstract class AbstractPollingEndpoint extends AbstractEndpoint implement
break;
}
count++;
} catch (Exception e) {
}
catch (Exception e) {
if (e instanceof RuntimeException) {
throw (RuntimeException)e;
} else {
}
else {
throw new MessageHandlingException(new ErrorMessage(e));
}
}