diff --git a/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-3.0.xsd b/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-3.0.xsd index 320a234a26..eaa15525f6 100644 --- a/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-3.0.xsd +++ b/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-3.0.xsd @@ -1068,24 +1068,32 @@ - + - - - - Specify whether the service method must return a non-null value. This value will be - FALSE by - default, but if set to TRUE, a MessageHandlingException will be thrown when - the underlying service method (or - expression) returns a NULL value. - - - + + + + + + + + Specify whether the service method must return a non-null value. This value will be + FALSE by + default, but if set to TRUE, a MessageHandlingException will be thrown when + the underlying service method (or + expression) returns a NULL value. + + + + + + + @@ -1491,7 +1499,7 @@ - + diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/ChainParserSmartLifecycleAttributesTest.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/ChainParserSmartLifecycleAttributesTest.xml index dcf39c7da9..840750c1ca 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/ChainParserSmartLifecycleAttributesTest.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/ChainParserSmartLifecycleAttributesTest.xml @@ -12,7 +12,7 @@ auto-startup="false" phase="256" send-timeout="3000"> - + diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/ChainParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/ChainParserTests.java index 88390a35b2..49806f35b5 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/ChainParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/ChainParserTests.java @@ -339,6 +339,9 @@ public class ChainParserTests { assertEquals(256, handlerChain.getPhase()); assertEquals(3000L, TestUtils.getPropertyValue(handlerChain, "sendTimeout")); assertEquals(false, TestUtils.getPropertyValue(handlerChain, "running")); + //INT-3108 + MessageHandler serviceActivator = ctx.getBean("chain$child.sa-within-chain.handler", MessageHandler.class); + assertTrue(TestUtils.getPropertyValue(serviceActivator, "requiresReply", Boolean.class)); } @Test