root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #801 from echatman/patch-1 

* patch-1:
  Fix number parsing of @Scheduled attributes
This commit is contained in:
Stephane Nicoll 2015-05-20 20:46:53 +02:00
parent 0ed9ca097b 5652f02af0
commit 01d1e71d66
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java
View File

@ -75,6 +75,7 @@ import org.springframework.util.StringValueResolver;
* @author Mark Fisher * @author Mark Fisher
* @author Juergen Hoeller * @author Juergen Hoeller
* @author Chris Beams * @author Chris Beams
* @author Elizabeth Chatman
* @since 3.0 * @since 3.0
* @see Scheduled * @see Scheduled
* @see EnableScheduling * @see EnableScheduling
@ -295,7 +296,7 @@ public class ScheduledAnnotationBeanPostProcessor implements BeanPostProcessor,
initialDelayString = this.embeddedValueResolver.resolveStringValue(initialDelayString); initialDelayString = this.embeddedValueResolver.resolveStringValue(initialDelayString);
} }
try { try {
initialDelay = Integer.parseInt(initialDelayString); initialDelay = Long.parseLong(initialDelayString);
} }
catch (NumberFormatException ex) { catch (NumberFormatException ex) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
@ -343,7 +344,7 @@ public class ScheduledAnnotationBeanPostProcessor implements BeanPostProcessor,
fixedDelayString = this.embeddedValueResolver.resolveStringValue(fixedDelayString); fixedDelayString = this.embeddedValueResolver.resolveStringValue(fixedDelayString);
} }
try { try {
fixedDelay = Integer.parseInt(fixedDelayString); fixedDelay = Long.parseLong(fixedDelayString);
} }
catch (NumberFormatException ex) { catch (NumberFormatException ex) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
@ -367,7 +368,7 @@ public class ScheduledAnnotationBeanPostProcessor implements BeanPostProcessor,
fixedRateString = this.embeddedValueResolver.resolveStringValue(fixedRateString); fixedRateString = this.embeddedValueResolver.resolveStringValue(fixedRateString);
} }
try { try {
fixedRate = Integer.parseInt(fixedRateString); fixedRate = Long.parseLong(fixedRateString);
} }
catch (NumberFormatException ex) { catch (NumberFormatException ex) {
throw new IllegalArgumentException( throw new IllegalArgumentException(