From f40b4ffbc8e33e2624bcee9e5ced5c10f25d5426 Mon Sep 17 00:00:00 2001 From: Jerome Lacoste Date: Fri, 4 Feb 2011 22:34:26 +0100 Subject: [PATCH] JENKINS-8676 Windows XP slave stopped working in 1.396 (related to name change) After thinking about it, I don't want to deal with hudsonslave here. jenkinsslave should be found anyway, so that code path should not have been triggered. And cleaning up residual services isn't jenkins job. Otherwise both can't coexist. --- .../java/hudson/os/windows/ManagedWindowsServiceLauncher.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/core/src/main/java/hudson/os/windows/ManagedWindowsServiceLauncher.java b/core/src/main/java/hudson/os/windows/ManagedWindowsServiceLauncher.java index 0853b02090..ed2bc669f1 100644 --- a/core/src/main/java/hudson/os/windows/ManagedWindowsServiceLauncher.java +++ b/core/src/main/java/hudson/os/windows/ManagedWindowsServiceLauncher.java @@ -311,9 +311,6 @@ public class ManagedWindowsServiceLauncher extends ComputerLauncher { session.setGlobalSocketTimeout(60000); SWbemServices services = WMI.connect(session, computer.getName()); Win32Service slaveService = services.getService("jenkinsslave"); - if(slaveService==null) { // backward compatibility. is this needed ? - slaveService = services.getService("hudsonslave"); - } if(slaveService!=null) { listener.getLogger().println(Messages.ManagedWindowsServiceLauncher_StoppingService()); slaveService.StopService();