From e2fffb673a46292e2821e95dafe5f61f873c781f Mon Sep 17 00:00:00 2001
From: mrossign <mrossign@localhost>
Date: Fri, 06 Nov 2009 16:50:21 +0000
Subject: [PATCH] - Corrected an error that made monitoring retrieval timeout - Allow 0 value for monitoring publisher period to allow disable it by configuration
---
opends/src/server/org/opends/server/replication/server/ReplicationServer.java | 2 +-
opends/src/admin/defn/org/opends/server/admin/std/ReplicationServerConfiguration.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/opends/src/admin/defn/org/opends/server/admin/std/ReplicationServerConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/ReplicationServerConfiguration.xml
index 57e8b50..ac060ce 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/ReplicationServerConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/ReplicationServerConfiguration.xml
@@ -311,7 +311,7 @@
</adm:defined>
</adm:default-behavior>
<adm:syntax>
- <adm:duration base-unit="ms" lower-limit="1000" />
+ <adm:duration base-unit="ms" lower-limit="0" />
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
diff --git a/opends/src/server/org/opends/server/replication/server/ReplicationServer.java b/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
index 71f4386..a33973e 100644
--- a/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
+++ b/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
@@ -1545,7 +1545,7 @@
* @return True if both identifiers are the same.
*/
public boolean equals(Object obj) {
- if ( (obj == null) || (obj instanceof GlobalServerId))
+ if ( (obj == null) || (!(obj instanceof GlobalServerId)))
return false;
GlobalServerId globalServerId = (GlobalServerId)obj;
--
Gitblit v1.10.0