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 2023/03/05 14:27:12 UTC
[commons-pool] 03/04: Use java.time
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-pool.git
commit 69d85af508968dc8c93632056043b4de54fca00a
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Mar 5 08:55:54 2023 -0500
Use java.time
---
.../org/apache/commons/pool2/impl/GenericKeyedObjectPool.java | 5 +++--
.../java/org/apache/commons/pool2/impl/GenericObjectPool.java | 9 ++++-----
src/test/java/org/apache/commons/pool2/ObjectPoolIssue326.java | 5 +++--
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java b/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
index 2badcb31..2ac96297 100644
--- a/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
+++ b/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
@@ -17,6 +17,7 @@
package org.apache.commons.pool2.impl;
import java.time.Duration;
+import java.time.Instant;
import java.util.ArrayList;
import java.util.Deque;
import java.util.HashMap;
@@ -422,7 +423,7 @@ public class GenericKeyedObjectPool<K, T, E extends Exception> extends BaseGener
final boolean blockWhenExhausted = getBlockWhenExhausted();
boolean create;
- final long waitTimeMillis = System.currentTimeMillis();
+ final Instant waitTime = Instant.now();
final ObjectDeque<T> objectDeque = register(key);
try {
@@ -502,7 +503,7 @@ public class GenericKeyedObjectPool<K, T, E extends Exception> extends BaseGener
deregister(key);
}
- updateStatsBorrow(p, Duration.ofMillis(System.currentTimeMillis() - waitTimeMillis));
+ updateStatsBorrow(p, Duration.between(waitTime, Instant.now()));
return p.getObject();
}
diff --git a/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java b/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
index f6349c16..d74079de 100644
--- a/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
+++ b/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
@@ -17,6 +17,7 @@
package org.apache.commons.pool2.impl;
import java.time.Duration;
+import java.time.Instant;
import java.util.ArrayList;
import java.util.NoSuchElementException;
import java.util.Set;
@@ -285,7 +286,7 @@ public class GenericObjectPool<T, E extends Exception> extends BaseGenericObject
final boolean blockWhenExhausted = getBlockWhenExhausted();
boolean create;
- final long waitTimeMillis = System.currentTimeMillis();
+ final Instant waitTime = Instant.now();
while (p == null) {
create = false;
@@ -361,7 +362,7 @@ public class GenericObjectPool<T, E extends Exception> extends BaseGenericObject
}
}
- updateStatsBorrow(p, Duration.ofMillis(System.currentTimeMillis() - waitTimeMillis));
+ updateStatsBorrow(p, Duration.between(waitTime, Instant.now()));
return p.getObject();
}
@@ -544,9 +545,7 @@ public class GenericObjectPool<T, E extends Exception> extends BaseGenericObject
}
// Do not block more if maxWaitTimeMillis is set.
- if (create == null &&
- localMaxWaitTimeMillis > 0 &&
- System.currentTimeMillis() - localStartTimeMillis >= localMaxWaitTimeMillis) {
+ if (create == null && localMaxWaitTimeMillis > 0 && System.currentTimeMillis() - localStartTimeMillis >= localMaxWaitTimeMillis) {
create = Boolean.FALSE;
}
}
diff --git a/src/test/java/org/apache/commons/pool2/ObjectPoolIssue326.java b/src/test/java/org/apache/commons/pool2/ObjectPoolIssue326.java
index 6e5d78a8..6f4555b1 100644
--- a/src/test/java/org/apache/commons/pool2/ObjectPoolIssue326.java
+++ b/src/test/java/org/apache/commons/pool2/ObjectPoolIssue326.java
@@ -18,6 +18,7 @@
package org.apache.commons.pool2;
import java.time.Duration;
+import java.time.Instant;
import java.util.ArrayList;
import java.util.List;
import java.util.NoSuchElementException;
@@ -137,7 +138,7 @@ public final class ObjectPoolIssue326 {
// 4 core box.
// too many doesn't reproduce it ever, too few doesn't either.
final ExecutorService service = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors() * 2);
- final long startTimeMillis = System.currentTimeMillis();
+ final Instant startTime = Instant.now();
long testIter = 0;
try {
while (true) {
@@ -152,7 +153,7 @@ public final class ObjectPoolIssue326 {
}
}
} finally {
- System.out.println("Time: " + (System.currentTimeMillis() - startTimeMillis) / 1000.0);
+ System.out.println("Time: " + Duration.between(startTime, Instant.now()));
service.shutdown();
}
}