From c015616756e6faa64060971753bc77978ae82dec Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Wed, 07 Oct 2009 12:19:42 +0000
Subject: [PATCH] The documentation and the configuration of a Replication Domain allow a maximum value of 65535 for the server-id property. Nevertheless, the server-id in the ReplicationDomain implementation is managed as a short allowing a maximum value of 32767.
---
opends/src/server/org/opends/server/replication/server/ServerWriter.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/ServerWriter.java b/opends/src/server/org/opends/server/replication/server/ServerWriter.java
index 340983a..37579ba 100644
--- a/opends/src/server/org/opends/server/replication/server/ServerWriter.java
+++ b/opends/src/server/org/opends/server/replication/server/ServerWriter.java
@@ -71,7 +71,7 @@
* @param replicationServerDomain The ReplicationServerDomain of this
* ServerWriter.
*/
- public ServerWriter(ProtocolSession session, short serverId,
+ public ServerWriter(ProtocolSession session, int serverId,
ServerHandler handler,
ReplicationServerDomain replicationServerDomain)
{
@@ -133,20 +133,20 @@
replicationServerDomain.getGenerationId();
if (dsStatus == ServerStatus.BAD_GEN_ID_STATUS)
logError(ERR_IGNORING_UPDATE_TO_DS_BADGENID.get(
- Short.toString(replicationServerDomain.getReplicationServer().
+ Integer.toString(replicationServerDomain.getReplicationServer().
getServerId()),
replicationServerDomain.getBaseDn(),
update.getChangeNumber().toString(),
- Short.toString(handler.getServerId()),
+ Integer.toString(handler.getServerId()),
Long.toString(handler.getGenerationId()),
Long.toString(referenceGenerationId)));
if (dsStatus == ServerStatus.FULL_UPDATE_STATUS)
logError(ERR_IGNORING_UPDATE_TO_DS_FULLUP.get(
- Short.toString(replicationServerDomain.getReplicationServer().
+ Integer.toString(replicationServerDomain.getReplicationServer().
getServerId()),
replicationServerDomain.getBaseDn(),
update.getChangeNumber().toString(),
- Short.toString(handler.getServerId())));
+ Integer.toString(handler.getServerId())));
continue;
}
} else
@@ -161,11 +161,11 @@
(referenceGenerationId == -1) || (handler.getGenerationId() == -1))
{
logError(ERR_IGNORING_UPDATE_TO_RS.get(
- Short.toString(replicationServerDomain.getReplicationServer().
+ Integer.toString(replicationServerDomain.getReplicationServer().
getServerId()),
replicationServerDomain.getBaseDn(),
update.getChangeNumber().toString(),
- Short.toString(handler.getServerId()),
+ Integer.toString(handler.getServerId()),
Long.toString(handler.getGenerationId()),
Long.toString(referenceGenerationId)));
continue;
@@ -199,7 +199,7 @@
* be removed, just ignore the exception and let the thread die as well
*/
errMessage = NOTE_SERVER_DISCONNECT.get(handler.toString(),
- Short.toString(replicationServerDomain.
+ Integer.toString(replicationServerDomain.
getReplicationServer().getServerId()));
logError(errMessage);
}
@@ -210,7 +210,7 @@
* be removed, just ignore the exception and let the thread die as well
*/
errMessage = NOTE_SERVER_DISCONNECT.get(handler.toString(),
- Short.toString(replicationServerDomain.
+ Integer.toString(replicationServerDomain.
getReplicationServer().getServerId()));
logError(errMessage);
}
--
Gitblit v1.10.0