From ae408b6c09759f61754f3e7b39d5e5d6595c1fc4 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.

---
 opendj-sdk/opends/src/server/org/opends/server/replication/protocol/InitializeTargetMsg.java |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/InitializeTargetMsg.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/InitializeTargetMsg.java
index 194c4ea..a477f0c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/InitializeTargetMsg.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/InitializeTargetMsg.java
@@ -22,7 +22,7 @@
  * CDDL HEADER END
  *
  *
- *      Copyright 2006-2008 Sun Microsystems, Inc.
+ *      Copyright 2006-2009 Sun Microsystems, Inc.
  */
 package org.opends.server.replication.protocol;
 
@@ -45,22 +45,22 @@
   // to happen. It allows a server that previously sent an
   // InitializeRequestMessage to know that the current message
   // is related to its own request.
-  private short requestorID;
+  private int requestorID;
 
   /**
    * Creates a InitializeDestinationMessage.
    *
    * @param baseDN The base DN for which the InitializeMessage is created.
-   * @param senderID The serverID of the server that sends this message.
-   * @param destination The destination of this message.
-   * @param requestorID The server that initiates this export.
+   * @param serverID The serverID of the server that sends this message.
+   * @param target The destination of this message.
+   * @param target2 The server that initiates this export.
    * @param entryCount The count of entries that will be sent.
    */
-  public InitializeTargetMsg(String baseDN, short senderID,
-      short destination, short requestorID, long entryCount)
+  public InitializeTargetMsg(String baseDN, int serverID,
+      int target, int target2, long entryCount)
   {
-    super(senderID, destination);
-    this.requestorID = requestorID;
+    super(serverID, target);
+    this.requestorID = target2;
     this.baseDN = baseDN;
     this.entryCount = entryCount;
   }
@@ -85,7 +85,7 @@
       // destination
       int length = getNextLength(in, pos);
       String destinationString = new String(in, pos, length, "UTF-8");
-      this.destination = Short.valueOf(destinationString);
+      this.destination = Integer.valueOf(destinationString);
       pos += length +1;
 
       // baseDn
@@ -96,13 +96,13 @@
       // sender
       length = getNextLength(in, pos);
       String senderString = new String(in, pos, length, "UTF-8");
-      senderID = Short.valueOf(senderString);
+      senderID = Integer.valueOf(senderString);
       pos += length +1;
 
       // requestor
       length = getNextLength(in, pos);
       String requestorString = new String(in, pos, length, "UTF-8");
-      requestorID = Short.valueOf(requestorString);
+      requestorID = Integer.valueOf(requestorString);
       pos += length +1;
 
       // entryCount

--
Gitblit v1.10.0