diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/config/ExecutorBeanDefinitionParser.java b/org.springframework.context/src/main/java/org/springframework/scheduling/config/ExecutorBeanDefinitionParser.java index 563a3b1b5b8..ab0dc76b586 100644 --- a/org.springframework.context/src/main/java/org/springframework/scheduling/config/ExecutorBeanDefinitionParser.java +++ b/org.springframework.context/src/main/java/org/springframework/scheduling/config/ExecutorBeanDefinitionParser.java @@ -53,20 +53,20 @@ public class ExecutorBeanDefinitionParser extends AbstractSingleBeanDefinitionPa builder.addPropertyValue("queueCapacity", queueCapacity); } this.configureRejectionPolicy(element, builder); - String size = element.getAttribute("size"); - if (!StringUtils.hasText(size)) { + String poolSize = element.getAttribute("pool-size"); + if (!StringUtils.hasText(poolSize)) { return; } Integer[] range = null; try { - int separatorIndex = size.indexOf('-'); + int separatorIndex = poolSize.indexOf('-'); if (separatorIndex != -1) { range = new Integer[2]; - range[0] = Integer.valueOf(size.substring(0, separatorIndex)); - range[1] = Integer.valueOf(size.substring(separatorIndex + 1, size.length())); + range[0] = Integer.valueOf(poolSize.substring(0, separatorIndex)); + range[1] = Integer.valueOf(poolSize.substring(separatorIndex + 1, poolSize.length())); if (range[0] > range[1]) { parserContext.getReaderContext().error( - "Lower bound of size range must not exceed the upper bound.", element); + "Lower bound of pool-size range must not exceed the upper bound.", element); } if (!StringUtils.hasText(queueCapacity)) { // no queue-capacity provided, so unbounded @@ -84,13 +84,13 @@ public class ExecutorBeanDefinitionParser extends AbstractSingleBeanDefinitionPa } } else { - Integer value = Integer.valueOf(size); + Integer value = Integer.valueOf(poolSize); range = new Integer[] {value, value}; } } catch (NumberFormatException ex) { - parserContext.getReaderContext().error("Invalid size value [" + size + "]: only " + - "single maximum integer (e.g. \"5\") and minimum-maximum combo (e.g. \"3-5\") supported.", + parserContext.getReaderContext().error("Invalid pool-size value [" + poolSize + "]: only single " + + "maximum integer (e.g. \"5\") and minimum-maximum range (e.g. \"3-5\") are supported.", element, ex); } if (range != null) { @@ -138,8 +138,8 @@ public class ExecutorBeanDefinitionParser extends AbstractSingleBeanDefinitionPa } private boolean shouldUseBackport(Element element) { - String size = element.getAttribute("size"); - return StringUtils.hasText(size) && size.startsWith("0") + String poolSize = element.getAttribute("pool-size"); + return StringUtils.hasText(poolSize) && poolSize.startsWith("0") && JdkVersion.getMajorJavaVersion() < JdkVersion.JAVA_16; } diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/config/SchedulerBeanDefinitionParser.java b/org.springframework.context/src/main/java/org/springframework/scheduling/config/SchedulerBeanDefinitionParser.java index 274b84b631a..dba85fca505 100644 --- a/org.springframework.context/src/main/java/org/springframework/scheduling/config/SchedulerBeanDefinitionParser.java +++ b/org.springframework.context/src/main/java/org/springframework/scheduling/config/SchedulerBeanDefinitionParser.java @@ -37,9 +37,9 @@ public class SchedulerBeanDefinitionParser extends AbstractSingleBeanDefinitionP @Override protected void doParse(Element element, BeanDefinitionBuilder builder) { - String size = element.getAttribute("size"); - if (StringUtils.hasText(size)) { - builder.addPropertyValue("poolSize", size); + String poolSize = element.getAttribute("pool-size"); + if (StringUtils.hasText(poolSize)) { + builder.addPropertyValue("poolSize", poolSize); } } diff --git a/org.springframework.context/src/main/resources/org/springframework/scheduling/config/spring-task-3.0.xsd b/org.springframework.context/src/main/resources/org/springframework/scheduling/config/spring-task-3.0.xsd index 84deb60b21b..b87680766a3 100644 --- a/org.springframework.context/src/main/resources/org/springframework/scheduling/config/spring-task-3.0.xsd +++ b/org.springframework.context/src/main/resources/org/springframework/scheduling/config/spring-task-3.0.xsd @@ -62,7 +62,7 @@ ]]> - + - + - + - + - + diff --git a/org.springframework.context/src/test/resources/org/springframework/scheduling/config/schedulerContext.xml b/org.springframework.context/src/test/resources/org/springframework/scheduling/config/schedulerContext.xml index 21ee9525030..9d2f54fced4 100644 --- a/org.springframework.context/src/test/resources/org/springframework/scheduling/config/schedulerContext.xml +++ b/org.springframework.context/src/test/resources/org/springframework/scheduling/config/schedulerContext.xml @@ -9,6 +9,6 @@ - +