From 87e069074e41b0008cf0b549fce36b7dc4fcae30 Mon Sep 17 00:00:00 2001
From: fdorson <fdorson@localhost>
Date: Mon, 07 Jul 2008 14:45:19 +0000
Subject: [PATCH] 2nd try: fix for issue #3317 : Removing replication links requires re-start of the server and issue #3363 : NullPointerException in ReplicationBroker.java
---
opends/src/server/org/opends/server/replication/plugin/ReplicationBroker.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/plugin/ReplicationBroker.java b/opends/src/server/org/opends/server/replication/plugin/ReplicationBroker.java
index fc03812..31cd19f 100644
--- a/opends/src/server/org/opends/server/replication/plugin/ReplicationBroker.java
+++ b/opends/src/server/org/opends/server/replication/plugin/ReplicationBroker.java
@@ -697,7 +697,6 @@
}
} // For late servers
}
-
return bestServer;
}
@@ -1001,7 +1000,7 @@
try
{
rcvWindow--;
- if (rcvWindow < halfRcvWindow)
+ if ((rcvWindow < halfRcvWindow) && (session != null))
{
session.publish(new WindowMessage(halfRcvWindow));
rcvWindow += halfRcvWindow;
@@ -1196,9 +1195,10 @@
this.maxReceiveQueue = maxReceiveQueue;
this.maxSendDelay = maxSendDelay;
this.maxSendQueue = maxSendQueue;
- // TODO : Changing those parameters requires to either restart a new
- // session with the replicationServer or renegociate the parameters that
- // were sent in the ServerStart message
+
+ // For info, a new session with the replicationServer
+ // will be recreated in the replication domain
+ // to take into account the new configuration.
}
/**
--
Gitblit v1.10.0