From 12528a2548d419b1d48d1ec70f0f9ae3a94c0b20 Mon Sep 17 00:00:00 2001 From: jvergara <jvergara@localhost> Date: Fri, 23 Oct 2009 19:44:22 +0000 Subject: [PATCH] Fix for issue 4313 (Control-panel stop triggers authentication pop-up) After getting the return code from stop-ds, verify that the server released its lock on the file used to test that it is running. --- opends/src/messages/messages/admin_tool.properties | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/opends/src/messages/messages/admin_tool.properties b/opends/src/messages/messages/admin_tool.properties index bfb7558..c2ad5e5 100644 --- a/opends/src/messages/messages/admin_tool.properties +++ b/opends/src/messages/messages/admin_tool.properties @@ -1206,23 +1206,25 @@ INFO_CTRL_PANEL_STARTING_SERVER_SUCCESSFUL_DETAILS=The server started \ successfully MILD_ERR_CTRL_PANEL_STARTING_SERVER_ERROR_SUMMARY=Error during server start -MILD_ERR_CTRL_PANEL_STARTING_SERVER_ERROR_DETAILS=An error starting the \ - server. Error code: %d +MILD_ERR_CTRL_PANEL_STARTING_SERVER_ERROR_DETAILS=An error occurred starting \ + the server. Error code: %d INFO_CTRL_PANEL_RESTARTING_SERVER_SUCCESSFUL_SUMMARY=Restart Complete INFO_CTRL_PANEL_RESTARTING_SERVER_SUCCESSFUL_DETAILS=The server restarted \ successfully MILD_ERR_CTRL_PANEL_RESTARTING_SERVER_ERROR_SUMMARY=Error during server restart -MILD_ERR_CTRL_PANEL_RESTARTING_SERVER_ERROR_DETAILS=An error restarting the \ - server. Error code: %d +MILD_ERR_CTRL_PANEL_RESTARTING_SERVER_ERROR_DETAILS=An error occurred \ + restarting the server. Error code: %d INFO_CTRL_PANEL_STOPPING_SERVER_SUMMARY=Stopping Server... INFO_CTRL_PANEL_STOPPING_SERVER_SUCCESSFUL_SUMMARY=Stop Complete INFO_CTRL_PANEL_STOPPING_SERVER_SUCCESSFUL_DETAILS=The server stopped \ successfully MILD_ERR_CTRL_PANEL_STOPPING_SERVER_ERROR_SUMMARY=Error during Server Stop -MILD_ERR_CTRL_PANEL_STOPPING_SERVER_ERROR_DETAILS=An error stopping the \ - server. Error code: %d +MILD_ERR_CTRL_PANEL_STOPPING_SERVER_ERROR_DETAILS=An error occurred stopping \ + the server. Error code: %d +MILD_ERR_CTRL_PANEL_STOPPING_SERVER_POST_CMD_LINE=The command-line %s returned \ + successfully but the server appears to be running. INFO_CTRL_PANEL_CLOSE_WINDOW_WHEN_OPERATION_COMPLETES_LABEL=Close window when \ operation completes -- Gitblit v1.10.0