From 41bef7c0b619c7bc925326451a56071b5736580a Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 19 Jun 2013 08:36:16 +0000
Subject: [PATCH] Fix OPENDJ-986: Exception when reading messages from Replication server RS
---
opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java b/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
index 4969607..a6ebfc1 100644
--- a/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
+++ b/opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
@@ -617,8 +617,7 @@
if (preparedAssuredInfo.expectedServers == null)
{
// No eligible servers found, send the ack immediately
- AckMsg ack = new AckMsg(cn);
- sourceHandler.sendAck(ack);
+ sourceHandler.send(new AckMsg(cn));
}
return preparedAssuredInfo;
@@ -672,8 +671,7 @@
* mode with safe data level 1, coming from a DS. No need to wait
* for more acks
*/
- AckMsg ack = new AckMsg(cn);
- sourceHandler.sendAck(ack);
+ sourceHandler.send(new AckMsg(cn));
} else
{
/**
@@ -700,8 +698,7 @@
} else
{
// level > 1, so Ack this message to originator RS
- AckMsg ack = new AckMsg(cn);
- sourceHandler.sendAck(ack);
+ sourceHandler.send(new AckMsg(cn));
}
}
}
@@ -753,8 +750,7 @@
{
// level > 1 and source is a DS but no eligible servers found, send the
// ack immediately
- AckMsg ack = new AckMsg(cn);
- sourceHandler.sendAck(ack);
+ sourceHandler.send(new AckMsg(cn));
}
}
@@ -798,7 +794,7 @@
ServerHandler origServer = expectedAcksInfo.getRequesterServer();
try
{
- origServer.sendAck(finalAck);
+ origServer.send(finalAck);
} catch (IOException e)
{
/**
@@ -877,7 +873,7 @@
Integer.toString(origServer.getServerId()));
try
{
- origServer.sendAck(finalAck);
+ origServer.send(finalAck);
} catch (IOException e)
{
/**
@@ -2489,7 +2485,7 @@
getReplicationServer().getServerId(),
handler.getServerId(),
message);
- handler.sendError(errorMsg);
+ handler.send(errorMsg);
}
/*
--
Gitblit v1.10.0