driver: move drop PendingRequest creation timestamp as argument

dCache · Dec 20, 2021 · 35a7056 · 35a7056
1 parent dc31938
commit 35a7056
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/main/java/org/dcache/nearline/cta/CtaNearlineStorage.java b/src/main/java/org/dcache/nearline/cta/CtaNearlineStorage.java
@@ -15,7 +15,6 @@
 import java.net.InetSocketAddress;
 import java.net.URI;
 import java.net.UnknownHostException;
-import java.time.Instant;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
@@ -196,7 +195,7 @@ public void onNext(ArchiveResponse response) {
                     );
 
                     var cancelRequest = ctaRequestFactory.cancelValueOf(ar, response);
-                    pendingRequests.put(id, new PendingRequest(Instant.now(), r) {
+                    pendingRequests.put(id, new PendingRequest(r) {
                               @Override
                               public void cancel() {
                                   // on cancel send the request to CTA; on success cancel the requests
@@ -278,7 +277,7 @@ public void onNext(RetrieveResponse response) {
                           response.getReqId()
                     );
                     var cancelRequest = ctaRequestFactory.cancelValueOf(rr, response);
-                    pendingRequests.put(id, new PendingRequest(Instant.now(), r) {
+                    pendingRequests.put(id, new PendingRequest(r) {
                               @Override
                               public void cancel() {
                                   // on cancel send the request to CTA; on success cancel the requests

diff --git a/src/main/java/org/dcache/nearline/cta/PendingRequest.java b/src/main/java/org/dcache/nearline/cta/PendingRequest.java
@@ -20,8 +20,8 @@ public class PendingRequest {
      */
     private final NearlineRequest request;
 
-    public PendingRequest(Instant submissionTime, NearlineRequest request) {
-        this.submissionTime = submissionTime;
+    public PendingRequest(NearlineRequest request) {
+        this.submissionTime = Instant.now();
         this.request = request;
     }