From 06779fb942a83a58766c73da4575f97050c38f48 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Thu, 22 Feb 2007 09:30:33 +0000
Subject: [PATCH] Fix for Issues #1025 and #1248 ('stop-ds.bat should be able to stop server even if LDAP port' and 'cannot stop server through status panel').
---
opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/StatusPanelController.java | 65 +-------------------------------
1 files changed, 3 insertions(+), 62 deletions(-)
diff --git a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/StatusPanelController.java b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/StatusPanelController.java
index 5478575..f17ff38 100644
--- a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/StatusPanelController.java
+++ b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/StatusPanelController.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Portions Copyright 2007 Sun Microsystems, Inc.
+ * Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
package org.opends.statuspanel;
@@ -280,24 +280,7 @@
}
else
{
- boolean stopServer = false;
- if (requiresAuthenticationToStop())
- {
- getLoginDialog().pack();
- Utils.centerOnComponent(getLoginDialog(), getStatusPanelDialog());
- getLoginDialog().setVisible(true);
- if (!getLoginDialog().isCancelled())
- {
- serverStatusPooler.setAuthentication(
- getLoginDialog().getDirectoryManagerDn(),
- getLoginDialog().getDirectoryManagerPwd());
- stopServer = confirmStop();
- }
- }
- else
- {
- stopServer = confirmStop();
- }
+ boolean stopServer = confirmStop();
if (stopServer)
{
@@ -378,24 +361,7 @@
}
else
{
- boolean restartServer = false;
- if (requiresAuthenticationToRestart())
- {
- getLoginDialog().pack();
- Utils.centerOnComponent(getLoginDialog(), getStatusPanelDialog());
- getLoginDialog().setVisible(true);
- if (!getLoginDialog().isCancelled())
- {
- serverStatusPooler.setAuthentication(
- getLoginDialog().getDirectoryManagerDn(),
- getLoginDialog().getDirectoryManagerPwd());
- restartServer = confirmRestart();
- }
- }
- else
- {
- restartServer = confirmRestart();
- }
+ boolean restartServer = confirmRestart();
if (restartServer)
{
@@ -693,10 +659,6 @@
if (Utils.isWindows())
{
argList.add(Utils.getPath(getBinariesPath(), "stop-ds.bat"));
- argList.add("--bindDN");
- argList.add(getLoginDialog().getDirectoryManagerDn());
- argList.add("--bindPassword");
- argList.add(getLoginDialog().getDirectoryManagerPwd());
} else
{
argList.add(Utils.getPath(getBinariesPath(), "stop-ds"));
@@ -1217,25 +1179,4 @@
{
return serverStatusPooler.isAuthenticated();
}
-
- private boolean requiresAuthenticationToStop()
- {
- boolean requireAuthentication;
- ServerStatusDescriptor desc = serverStatusPooler.getLastDescriptor();
- if (desc == null)
- {
- requireAuthentication = Utils.isWindows() && !isAuthenticated();
- }
- else
- {
- requireAuthentication = Utils.isWindows() &&
- (!isAuthenticated() || desc.getErrorMessage() != null);
- }
- return requireAuthentication;
- }
-
- private boolean requiresAuthenticationToRestart()
- {
- return requiresAuthenticationToStop();
- }
}
--
Gitblit v1.10.0