From 0d4040aa6334217069e84e7ec2bb5ef9f241279e Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 25 Aug 2020 16:16:34 +0200 Subject: [PATCH] Avoid potential integer overflow in seconds->millis transformation Closes gh-25613 --- .../context/support/AbstractResourceBasedMessageSource.java | 2 +- .../scheduling/concurrent/ExecutorConfigurationSupport.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-context/src/main/java/org/springframework/context/support/AbstractResourceBasedMessageSource.java b/spring-context/src/main/java/org/springframework/context/support/AbstractResourceBasedMessageSource.java index da969bf98a2..37ffa85e40f 100644 --- a/spring-context/src/main/java/org/springframework/context/support/AbstractResourceBasedMessageSource.java +++ b/spring-context/src/main/java/org/springframework/context/support/AbstractResourceBasedMessageSource.java @@ -218,7 +218,7 @@ public abstract class AbstractResourceBasedMessageSource extends AbstractMessage * a non-classpath location. */ public void setCacheSeconds(int cacheSeconds) { - this.cacheMillis = (cacheSeconds * 1000); + this.cacheMillis = cacheSeconds * 1000L; } /** diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ExecutorConfigurationSupport.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ExecutorConfigurationSupport.java index 338a23e691e..2aaab8c4c59 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ExecutorConfigurationSupport.java +++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ExecutorConfigurationSupport.java @@ -146,7 +146,7 @@ public abstract class ExecutorConfigurationSupport extends CustomizableThreadFac * @see java.util.concurrent.ExecutorService#awaitTermination */ public void setAwaitTerminationSeconds(int awaitTerminationSeconds) { - this.awaitTerminationMillis = awaitTerminationSeconds * 1000; + this.awaitTerminationMillis = awaitTerminationSeconds * 1000L; } /**