From 08d62ab30082bc0feb209c8de443b8ec9a419dd6 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Wed, 18 Jul 2007 21:28:42 +0000
Subject: [PATCH] Fix for issue 1603 (quickInstall fails to register service on vista)

---
 opendj-sdk/opends/src/server/org/opends/server/tools/StopWindowsService.java |   27 ++++++++++++++++++++++-----
 1 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/StopWindowsService.java b/opendj-sdk/opends/src/server/org/opends/server/tools/StopWindowsService.java
index 9a57f90..257722f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/StopWindowsService.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/StopWindowsService.java
@@ -31,6 +31,7 @@
 import java.io.PrintStream;
 
 import org.opends.server.types.NullOutputStream;
+import org.opends.server.util.SetupUtils;
 
 import static org.opends.server.messages.MessageHandler.getMessage;
 import static org.opends.server.messages.ToolMessages.*;
@@ -117,11 +118,27 @@
     }
     else
     {
-      String[] cmd = {
-          "net",
-          "stop",
-          serviceName
-          };
+      String[] cmd;
+      if (SetupUtils.isVista())
+      {
+        cmd= new String[] {
+            ConfigureWindowsService.getLauncherBinaryFullPath(),
+            ConfigureWindowsService.LAUNCHER_OPTION,
+            ConfigureWindowsService.getLauncherAdministratorBinaryFullPath(),
+            ConfigureWindowsService.LAUNCHER_OPTION,
+            "net",
+            "stop",
+            serviceName
+        };
+      }
+      else
+      {
+        cmd= new String[] {
+            "net",
+            "stop",
+            serviceName
+        };
+      }
       /* Check if is a running service */
       try
       {

--
Gitblit v1.10.0