You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2022/07/03 18:30:05 UTC
[commons-dbcp] branch master updated: Sort members
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbcp.git
The following commit(s) were added to refs/heads/master by this push:
new 4b2c6854 Sort members
4b2c6854 is described below
commit 4b2c6854d78cd058adf036f9a84b5a54944ded2d
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Jul 3 14:25:24 2022 -0400
Sort members
---
.../commons/dbcp2/datasources/PerUserPoolDataSource.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java b/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java
index 7056a46f..486aec16 100644
--- a/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java
+++ b/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java
@@ -984,11 +984,6 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource {
perUserMaxTotal.put(userName, value);
}
- void setPerUserMaxWaitDuration(final Map<String, Duration> newMap) {
- assertInitializationAllowed();
- perUserMaxWaitDuration = makeMap(perUserMaxWaitDuration, newMap);
- }
-
/**
* Sets a user specific value for {@link GenericObjectPool#getMaxWaitDuration()} for the specified user's pool.
*
@@ -1006,6 +1001,11 @@ public class PerUserPoolDataSource extends InstanceKeyDataSource {
perUserMaxWaitDuration.put(userName, value);
}
+ void setPerUserMaxWaitDuration(final Map<String, Duration> newMap) {
+ assertInitializationAllowed();
+ perUserMaxWaitDuration = makeMap(perUserMaxWaitDuration, newMap);
+ }
+
void setPerUserMaxWaitMillis(final Map<String, Long> newMap) {
assertInitializationAllowed();
perUserMaxWaitDuration = convertMap(perUserMaxWaitDuration, newMap);