From efde36226a332f8a4c407d15c3b389eb43c704a4 Mon Sep 17 00:00:00 2001
From: Chris Ridd <chris.ridd@forgerock.com>
Date: Mon, 16 Jun 2014 11:05:31 +0000
Subject: [PATCH] Forward port fix OPENDJ-1488 control-panel: LDAPS connection handler should not be displayed in monitoring section when it is disabled
---
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ConnectionHandlerMonitoringPanel.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ConnectionHandlerMonitoringPanel.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ConnectionHandlerMonitoringPanel.java
index 35b0999..f5d5d7f 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ConnectionHandlerMonitoringPanel.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ConnectionHandlerMonitoringPanel.java
@@ -590,10 +590,12 @@
private boolean protocolHasMonitoring(ConnectionHandlerDescriptor ch)
{
- return (ch.getProtocol() == Protocol.LDAP) ||
- (ch.getProtocol() == Protocol.LDAPS) ||
- (ch.getProtocol() == Protocol.LDAP_STARTTLS) ||
- (ch.getProtocol() == Protocol.OTHER);
+ if (ch.getState() == State.DISABLED)
+ return false;
+ return ch.getProtocol() == Protocol.LDAP ||
+ ch.getProtocol() == Protocol.LDAPS ||
+ ch.getProtocol() == Protocol.LDAP_STARTTLS ||
+ ch.getProtocol() == Protocol.OTHER;
}
/**
--
Gitblit v1.10.0