Skip to content

Commit 96f3a48

Browse files
committed
Polish "Enable minIdle by allowing timeBetweenEviction runs to be configured"
See gh-16703
1 parent 1659d46 commit 96f3a48

File tree

4 files changed

+8
-12
lines changed

4 files changed

+8
-12
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/JedisConnectionConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2018 the original author or authors.
2+
* Copyright 2012-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/LettuceConnectionConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2018 the original author or authors.
2+
* Copyright 2012-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisProperties.java

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2017 the original author or authors.
2+
* Copyright 2012-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -171,10 +171,8 @@ public static class Pool {
171171

172172
/**
173173
* Target for the minimum number of idle connections to maintain in the pool. This
174-
* setting only has an effect if it is positive.
175-
*
176-
* This setting only has an effect if it is positive and `timeBetweenEvictionRuns`
177-
* is greater than zero.
174+
* setting only has an effect if both it and time between eviction runs are
175+
* positive.
178176
*/
179177
private int minIdle = 0;
180178

@@ -192,10 +190,8 @@ public static class Pool {
192190
private Duration maxWait = Duration.ofMillis(-1);
193191

194192
/**
195-
* Time to sleep between runs of the idle object evictor thread.
196-
*
197-
* When positive, the idle object evictor thread starts. When non-positive, no
198-
* idle object evictor thread runs.
193+
* Time between runs of the idle object evictor thread. When positive, the idle
194+
* object evictor thread starts, otherwise no idle object eviction is performed.
199195
*/
200196
private Duration timeBetweenEvictionRuns;
201197

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationJedisTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2018 the original author or authors.
2+
* Copyright 2012-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)