diff --git a/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-4.1.xsd b/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-4.1.xsd index a7f00daa58..578cb85d84 100644 --- a/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-4.1.xsd +++ b/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-4.1.xsd @@ -1731,6 +1731,7 @@ + diff --git a/spring-integration-core/src/test/java/org/springframework/integration/scattergather/config/ScatterGatherTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/scattergather/config/ScatterGatherTests-context.xml index 94b70f9f48..8c6918c912 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/scattergather/config/ScatterGatherTests-context.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/scattergather/config/ScatterGatherTests-context.xml @@ -58,4 +58,9 @@ + + + + + diff --git a/spring-integration-core/src/test/java/org/springframework/integration/scattergather/config/ScatterGatherTests.java b/spring-integration-core/src/test/java/org/springframework/integration/scattergather/config/ScatterGatherTests.java index 3190e0e257..75b4991660 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/scattergather/config/ScatterGatherTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/scattergather/config/ScatterGatherTests.java @@ -55,6 +55,9 @@ public class ScatterGatherTests { @Autowired private RequestReplyExchanger gateway; + @Autowired + private MessageChannel scatterGatherWithinChain; + @Test public void testAuction() { this.inputAuction.send(new GenericMessage("foo")); @@ -83,4 +86,13 @@ public class ScatterGatherTests { assertThat(((List) payload).size(), greaterThanOrEqualTo(1)); } + @Test + public void testWithinChain() { + this.scatterGatherWithinChain.send(new GenericMessage("foo")); + for (int i = 0; i < 3; i++) { + Message result = this.output.receive(10000); + assertNotNull(result); + } + } + }