INT-3982: Fix XSD declaration ambiguity

JIRA: https://jira.spring.io/browse/INT-3982 Also fix some sporadic, timing issues in tests
2016-04-18 21:04:20 -04:00
parent 9e092d44f7
commit 818387f0a4
4 changed files with 13 additions and 21 deletions
--- a/spring-integration-core/src/main/resources/org/springframework/integration/config/spring-integration-4.3.xsd
+++ b/spring-integration-core/src/main/resources/org/springframework/integration/config/spring-integration-4.3.xsd
@@ -923,7 +923,7 @@
 						</xsd:choice>
 					</xsd:sequence>
 					<xsd:sequence>
-						<xsd:choice minOccurs="0" maxOccurs="1" >
+						<xsd:choice>
 							<xsd:element name="expression" type="innerExpressionType"/>
 							<xsd:any namespace="##other"/>
 						</xsd:choice>