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/ServerReader.java | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/ServerReader.java b/opends/src/server/org/opends/server/replication/server/ServerReader.java
index 6e35b64..c238e19 100644
--- a/opends/src/server/org/opends/server/replication/server/ServerReader.java
+++ b/opends/src/server/org/opends/server/replication/server/ServerReader.java
@@ -57,7 +57,7 @@
* The tracer object for the debug logger.
*/
private static final DebugTracer TRACER = getTracer();
- private short serverId;
+ private int serverId;
private ProtocolSession session;
private ServerHandler handler;
private ReplicationServerDomain replicationServerDomain;
@@ -71,7 +71,7 @@
* @param replicationServerDomain The ReplicationServerDomain for this server
* reader.
*/
- public ServerReader(ProtocolSession session, short serverId,
+ public ServerReader(ProtocolSession session, int serverId,
ServerHandler handler,
ReplicationServerDomain replicationServerDomain)
{
@@ -145,20 +145,20 @@
replicationServerDomain.getGenerationId();
if (dsStatus == ServerStatus.BAD_GEN_ID_STATUS)
logError(ERR_IGNORING_UPDATE_FROM_DS_BADGENID.get(
- Short.toString(replicationServerDomain.
+ Integer.toString(replicationServerDomain.
getReplicationServer().getServerId()),
replicationServerDomain.getBaseDn(),
((UpdateMsg) msg).getChangeNumber().toString(),
- Short.toString(handler.getServerId()),
+ Integer.toString(handler.getServerId()),
Long.toString(referenceGenerationId),
Long.toString(handler.getGenerationId())));
if (dsStatus == ServerStatus.FULL_UPDATE_STATUS)
logError(ERR_IGNORING_UPDATE_FROM_DS_FULLUP.get(
- Short.toString(replicationServerDomain.
+ Integer.toString(replicationServerDomain.
getReplicationServer().getServerId()),
replicationServerDomain.getBaseDn(),
((UpdateMsg) msg).getChangeNumber().toString(),
- Short.toString(handler.getServerId())));
+ Integer.toString(handler.getServerId())));
filtered = true;
}
} else
@@ -172,14 +172,16 @@
if ((referenceGenerationId > 0) &&
(referenceGenerationId != handler.getGenerationId()))
{
- logError(ERR_IGNORING_UPDATE_FROM_RS.get(
- Short.toString(replicationServerDomain.getReplicationServer().
- getServerId()),
- replicationServerDomain.getBaseDn(),
- ((UpdateMsg) msg).getChangeNumber().toString(),
- Short.toString(handler.getServerId()),
- Long.toString(referenceGenerationId),
- Long.toString(handler.getGenerationId())));
+ logError(
+ ERR_IGNORING_UPDATE_FROM_RS.get(
+ Integer.toString(
+ replicationServerDomain.getReplicationServer().
+ getServerId()),
+ replicationServerDomain.getBaseDn(),
+ ((UpdateMsg) msg).getChangeNumber().toString(),
+ Integer.toString(handler.getServerId()),
+ Long.toString(referenceGenerationId),
+ Long.toString(handler.getGenerationId())));
filtered = true;
}
}
@@ -252,7 +254,7 @@
errMessage =
ERR_RECEIVED_CHANGE_STATUS_NOT_FROM_DS.get(
replicationServerDomain.getBaseDn(),
- Short.toString(handler.getServerId()),
+ Integer.toString(handler.getServerId()),
csMsg.toString());
logError(errMessage);
}
@@ -307,7 +309,7 @@
this + " " +
stackTraceToSingleLineString(e) + " " + e.getLocalizedMessage());
errMessage = NOTE_SERVER_DISCONNECT.get(handler.toString(),
- Short.toString(replicationServerDomain.
+ Integer.toString(replicationServerDomain.
getReplicationServer().getServerId()));
logError(errMessage);
}
--
Gitblit v1.10.0