EC2RetentionStrategy - move initialization of clock to readResolve

jenkinsci · May 28, 2019 · 4973e9f · 4973e9f
1 parent d49078e
commit 4973e9f
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/src/main/java/hudson/plugins/ec2/EC2RetentionStrategy.java b/src/main/java/hudson/plugins/ec2/EC2RetentionStrategy.java
@@ -87,7 +87,6 @@ public EC2RetentionStrategy(String idleTerminationMinutes) {
 
             this.idleTerminationMinutes = value;
         }
-        this.clock = Clock.systemUTC();
     }
 
 
@@ -107,9 +106,6 @@ public long check(EC2Computer c) {
             return 1;
         } else {
             try {
-                if (this.clock == null){
-                    this.clock = Clock.systemUTC();
-                }
                 long currentTime = this.clock.millis();
 
                 if (currentTime > nextCheckAfter) {
@@ -238,6 +234,7 @@ public String getDisplayName() {
 
     protected Object readResolve() {
         checkLock = new ReentrantLock(false);
+        clock = Clock.systemUTC();
         return this;
     }