Revert "Fix JENKINS-35272: Prevent afterDisconnect() from being called twice"

Causes Windows test failures in UnsupportedRemotingAgentTest

Fixes #26335

Reverts pull request:

* #26188

This reverts commit 799d362.

Author: MarkEWaite

core/src/main/java/hudson/slaves/SlaveComputer.java

@@ -75,7 +75,6 @@
 import java.util.Map;
 import java.util.TreeMap;
 import java.util.concurrent.Future;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Handler;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
@@ -151,13 +150,6 @@ public class SlaveComputer extends Computer {
 
     private Object constructed = new Object();
 
-    /**
-     * Flag to ensure afterDisconnect() is only called once per disconnect cycle.
-     * Reset when a new connection is established.
-     * Thread-safe to handle concurrent disconnect scenarios.
-     */
-    private final AtomicBoolean afterDisconnectCalled = new AtomicBoolean(false);
-
     private transient volatile String absoluteRemoteFs;
 
     public SlaveComputer(Slave slave) {
@@ -640,9 +632,6 @@ public void setChannel(@NonNull Channel channel,
         if (this.channel != null)
             throw new IllegalStateException("Already connected");
 
-        // Reset the flag for the new connection
-        afterDisconnectCalled.set(false);
-
         final TaskListener taskListener = launchLog != null ? new StreamTaskListener(launchLog) : TaskListener.NULL;
         PrintStream log = taskListener.getLogger();
 
@@ -662,9 +651,7 @@ public void onClosed(Channel c, IOException cause) {
                 }
                 closeChannel();
                 try {
-                    if (afterDisconnectCalled.compareAndSet(false, true)) {
-                        launcher.afterDisconnect(SlaveComputer.this, taskListener);
-                    }
+                    launcher.afterDisconnect(SlaveComputer.this, taskListener);
                 } catch (Throwable t) {
                     LogRecord lr = new LogRecord(Level.SEVERE,
                             "Launcher {0}'s afterDisconnect method propagated an exception when {1}'s connection was closed: {2}");
@@ -836,10 +823,7 @@ public Future<?> disconnect(OfflineCause cause) {
             // (which could be typical) won't block UI thread.
             launcher.beforeDisconnect(SlaveComputer.this, taskListener);
             closeChannel();
-            // Only call afterDisconnect if it hasn't been called yet
-            if (afterDisconnectCalled.compareAndSet(false, true)) {
-                launcher.afterDisconnect(SlaveComputer.this, taskListener);
-            }
+            launcher.afterDisconnect(SlaveComputer.this, taskListener);
         });
     }
 

test/src/test/java/hudson/model/ComputerTest.java

@@ -54,7 +54,6 @@
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.util.Map;
-import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import jenkins.model.Jenkins;
@@ -193,8 +192,7 @@ private void verifyOfflineCause(Computer computer) throws Exception {
     @Test
     void addAction() throws Exception {
         Computer c = j.createSlave().toComputer();
-        class A extends InvisibleAction {
-        }
+        class A extends InvisibleAction {}
 
         assertEquals(0, c.getActions(A.class).size());
         c.addAction(new A());
@@ -369,54 +367,4 @@ public void isConnectedTest() throws Exception {
         assertThat(computer.isConnected(), is(false));
         assertThat(computer.isOffline(), is(true));
     }
-
-    @Issue("JENKINS-17204")
-    @Test
-    void testMultipleDisconnectCallsHandledProperly() throws Exception {
-        DumbSlave agent = j.createOnlineSlave();
-        Computer computer = agent.toComputer();
-
-        // Sanity check
-        assertTrue(computer.isOnline(), "Agent should be online initially");
-
-        // Simulate multiple concurrent disconnect calls
-        Future<?> f1 = computer.disconnect(
-                new OfflineCause.UserCause(User.getUnknown(), "disconnect 1"));
-        Future<?> f2 = computer.disconnect(
-                new OfflineCause.UserCause(User.getUnknown(), "disconnect 2"));
-        Future<?> f3 = computer.disconnect(
-                new OfflineCause.UserCause(User.getUnknown(), "disconnect 3"));
-
-        // Wait for all disconnects to complete
-        f1.get();
-        f2.get();
-        f3.get();
-
-        // Agent must be cleanly disconnected
-        assertFalse(computer.isOnline(), "Computer should be offline");
-        assertFalse(computer.isConnected(), "Computer should not be connected");
-    }
-
-    @Issue("JENKINS-17204")
-    @Test
-    void testAfterDisconnectFlagResetOnReconnection() throws Exception {
-        DumbSlave agent = j.createOnlineSlave();
-        Computer computer = agent.toComputer();
-
-        // First disconnect
-        computer.disconnect(
-                new OfflineCause.UserCause(User.getUnknown(), "first disconnect")).get();
-        assertFalse(computer.isOnline(), "Computer should be offline after first disconnect");
-
-        // Reconnect
-        computer.connect(false);
-        await()
-                .atMost(Duration.ofSeconds(30))
-                .until(computer::isOnline);
-
-        // Disconnect again — flag must be reset
-        computer.disconnect(
-                new OfflineCause.UserCause(User.getUnknown(), "second disconnect")).get();
-        assertFalse(computer.isOnline(), "Computer should be offline after second disconnect");
-    }
 }