From 7adb93986ace907531875e25be1f94d735fbb068 Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Mon, 08 Dec 2008 08:03:33 +0000
Subject: [PATCH] Merge the replication-service branch with the OpenDS trunk
---
opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ReplicationMsg.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ReplicationMsg.java b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ReplicationMsg.java
index 5a0decd..b65af58 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ReplicationMsg.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/protocol/ReplicationMsg.java
@@ -69,6 +69,7 @@
static final byte MSG_TYPE_TOPOLOGY = 26;
static final byte MSG_TYPE_START_SESSION = 27;
static final byte MSG_TYPE_CHANGE_STATUS = 28;
+ static final byte MSG_TYPE_GENERIC_UPDATE = 29;
// Adding a new type of message here probably requires to
// change accordingly generateMsg method below
@@ -209,6 +210,9 @@
case MSG_TYPE_CHANGE_STATUS:
msg = new ChangeStatusMsg(buffer);
break;
+ case MSG_TYPE_GENERIC_UPDATE:
+ msg = new UpdateMsg(buffer);
+ break;
default:
throw new DataFormatException("received message with unknown type");
}
@@ -224,7 +228,8 @@
* @param pos the position where to concatenate.
* @return the next position to use in the resultByteArray.
*/
- protected int addByteArray(byte[] tail, byte[] resultByteArray, int pos)
+ protected static int addByteArray(byte[] tail, byte[] resultByteArray,
+ int pos)
{
for (int i=0; i<tail.length; i++,pos++)
{
--
Gitblit v1.10.0