GH-3418: Fix Poller Undeclared Checked Exceptions

garyrussell · artembilan · commit b1932942cfc4 · 2020-11-02T11:42:40.000-05:00
Resolves #3418 `Class.newInstance()` can propagate checked exceptions that are not declared. **cherry-pick/back-port to 5.3.x, 5.2.x, 4.3.x** # Conflicts: # spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java
@@ -48,6 +48,7 @@
 import org.springframework.util.ClassUtils;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ErrorHandler;
+import org.springframework.util.ReflectionUtils;
 
 /**
  * @author Mark Fisher
@@ -252,7 +253,7 @@ private boolean doPoll() {
 				return false;
 			}
 			else {
-				throw (RuntimeException) e;
+				ReflectionUtils.rethrowRuntimeException(e);
 			}
 		}
 		boolean result;

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@`
`48`	`48`	`import org.springframework.util.ClassUtils;`
`49`	`49`	`import org.springframework.util.CollectionUtils;`
`50`	`50`	`import org.springframework.util.ErrorHandler;`
	`51`	`+import org.springframework.util.ReflectionUtils;`
`51`	`52`
`52`	`53`	`/**`
`53`	`54`	`* @author Mark Fisher`
`@@ -252,7 +253,7 @@ private boolean doPoll() {`
`252`	`253`	`return false;`
`253`	`254`	`}`
`254`	`255`	`else {`
`255`		`- throw (RuntimeException) e;`
	`256`	`+ ReflectionUtils.rethrowRuntimeException(e);`
`256`	`257`	`}`
`257`	`258`	`}`
`258`	`259`	`boolean result;`