opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java
@@ -8814,14 +8814,21 @@ isServerRunning = true; } boolean configuredAsService = isRunningAsWindowsService(); if (isServerRunning) { returnValue = SERVER_ALREADY_STARTED; if (configuredAsService && !windowsNetStartPresent) { returnValue = START_AS_WINDOWS_SERVICE; } else { returnValue = SERVER_ALREADY_STARTED; } } else { boolean configuredAsService = isRunningAsWindowsService(); if (configuredAsService) { if (noDetachPresent) opendj-sdk/opends/src/server/org/opends/server/tools/StopDS.java
@@ -823,9 +823,23 @@ isServerRunning = true; } boolean configuredAsService = DirectoryServer.isRunningAsWindowsService(); if (!isServerRunning) { if (restartPresent) if (configuredAsService && !windowsNetStopPresent) { if (restartPresent) { returnValue = RESTART_AS_WINDOW_SERVICE; } else { returnValue = STOP_AS_WINDOW_SERVICE; } } else if (restartPresent) { returnValue = START_SERVER; } @@ -836,9 +850,6 @@ } else { boolean configuredAsService = DirectoryServer.isRunningAsWindowsService(); if (configuredAsService) { if (windowsNetStopPresent)