From b4d26639d2fef461b0e6e859ce846bdcb54857a3 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Fri, 04 Oct 2013 19:55:18 +0000
Subject: [PATCH] Fix regression introduced by the previous commit, which cause the JMXPrivilegeTests to fail. Note that these tests may still fail some time to time, since they expect the JMX connection handler to start in less than 1 second, which might be low on a single cpu VM.
---
opends/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/opends/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java b/opends/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java
index 3f902ca..0ddc2e0 100644
--- a/opends/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java
+++ b/opends/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java
@@ -407,9 +407,9 @@
{
JMXConnectionHandlerCfg config = (JMXConnectionHandlerCfg) configuration;
- if (currentConfig == null ||
+ if ((currentConfig == null ||
(!currentConfig.isEnabled() && config.isEnabled()) ||
- currentConfig.getListenPort() != config.getListenPort() &&
+ currentConfig.getListenPort() != config.getListenPort()) &&
!isPortConfigurationAcceptable(String.valueOf(config.dn()),
config.getListenPort(), unacceptableReasons))
{
--
Gitblit v1.10.0