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

Gateway now rethrows unwrapped RuntimeExceptions

Browse Source
This commit is contained in:
Mark Fisher
2011-08-17 12:29:30 -04:00
parent a7e4fc104b
commit e954e58e93
3 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2010 the original author or authors.
* Copyright 2002-2011 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@ package org.springframework.integration.gateway;
import java.lang.reflect.Method;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.lang.reflect.UndeclaredThrowableException;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
@@ -310,15 +311,21 @@ public class GatewayProxyFactoryBean extends AbstractEndpoint implements Trackab
private void rethrowExceptionInThrowsClauseIfPossible(Throwable originalException, Method method) throws Throwable {
List<Class<?>> exceptionTypes = Arrays.asList(method.getExceptionTypes());
Throwable t = originalException;
while (t != null) {
if (exceptionTypes.contains(t.getClass())) {
while (t instanceof MessagingException || t instanceof UndeclaredThrowableException) {
t = t.getCause();
}
if (t instanceof RuntimeException) {
throw t;
}
for (Class<?> exceptionType : exceptionTypes) {
if (exceptionType.isAssignableFrom(t.getClass())) {
throw t;
}
t = t.getCause();
}
throw originalException;
}
private MethodInvocationGateway createGatewayForMethod(Method method) {
Gateway gatewayAnnotation = method.getAnnotation(Gateway.class);
MessageChannel requestChannel = this.defaultRequestChannel;