From eacfcfd5bda2b713671dd19012fe4898f94967e9 Mon Sep 17 00:00:00 2001 From: Vincent Latombe Date: Mon, 4 Nov 2024 09:33:36 +0100 Subject: [PATCH 1/2] Fix compatibility with Jenkins 2.482+ Temporary offline cause is now persisted separately from technical offline cause. The getter must be used to achieve compatibility --- .../java/jenkins/plugins/openstack/compute/JCloudsComputer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/src/main/java/jenkins/plugins/openstack/compute/JCloudsComputer.java b/plugin/src/main/java/jenkins/plugins/openstack/compute/JCloudsComputer.java index bc5f7c23..e577057b 100644 --- a/plugin/src/main/java/jenkins/plugins/openstack/compute/JCloudsComputer.java +++ b/plugin/src/main/java/jenkins/plugins/openstack/compute/JCloudsComputer.java @@ -88,7 +88,7 @@ public void setPendingDelete(boolean newVal) { */ public boolean isPendingDelete() { // No need to synchronize reading as offlineCause is volatile - return offlineCause instanceof PendingTermination; + return getOfflineCause() instanceof PendingTermination; } /*package*/ boolean isUserOffline() { From d0590cbf6f90b7d3aadaa3e42285d6bee4ba6f13 Mon Sep 17 00:00:00 2001 From: Vincent Latombe Date: Tue, 5 Nov 2024 09:24:26 +0100 Subject: [PATCH 2/2] Update plugin/src/main/java/jenkins/plugins/openstack/compute/JCloudsComputer.java Co-authored-by: Jesse Glick --- .../java/jenkins/plugins/openstack/compute/JCloudsComputer.java | 1 - 1 file changed, 1 deletion(-) diff --git a/plugin/src/main/java/jenkins/plugins/openstack/compute/JCloudsComputer.java b/plugin/src/main/java/jenkins/plugins/openstack/compute/JCloudsComputer.java index e577057b..ed6bd77f 100644 --- a/plugin/src/main/java/jenkins/plugins/openstack/compute/JCloudsComputer.java +++ b/plugin/src/main/java/jenkins/plugins/openstack/compute/JCloudsComputer.java @@ -87,7 +87,6 @@ public void setPendingDelete(boolean newVal) { * Is slave pending termination. */ public boolean isPendingDelete() { - // No need to synchronize reading as offlineCause is volatile return getOfflineCause() instanceof PendingTermination; }