From aefad4e6cfa33be9eca8cda45861d98236d0faed Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Thu, 18 Jan 2007 09:20:48 +0000
Subject: [PATCH] put back the 980 revision that had been removed because of a regression.  - fix the regression (schema problem)  - disabled the ChangelogTest.stopChangelog() test that appear to cause    some hangs.

---
 opends/src/server/org/opends/server/synchronization/changelog/Changelog.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/opends/src/server/org/opends/server/synchronization/changelog/Changelog.java b/opends/src/server/org/opends/server/synchronization/changelog/Changelog.java
index 2a74fb9..f88251c 100644
--- a/opends/src/server/org/opends/server/synchronization/changelog/Changelog.java
+++ b/opends/src/server/org/opends/server/synchronization/changelog/Changelog.java
@@ -340,6 +340,7 @@
       {
         newSocket =  listenSocket.accept();
         newSocket.setReceiveBufferSize(1000000);
+        newSocket.setTcpNoDelay(true);
         ServerHandler handler = new ServerHandler(
                                      new SocketSession(newSocket), queueSize);
         handler.start(null, serverId, serverURL, rcvWindow, this);
@@ -414,11 +415,12 @@
                      InetAddress.getByName(hostname), Integer.parseInt(port));
       Socket socket = new Socket();
       socket.setReceiveBufferSize(1000000);
+      socket.setTcpNoDelay(true);
       socket.connect(ServerAddr, 500);
 
       ServerHandler handler = new ServerHandler(
                                       new SocketSession(socket), queueSize);
-      handler.start(baseDn, serverId, serverURL, rcvWindow, this);
+     handler.start(baseDn, serverId, this.serverURL, rcvWindow, this);
     }
     catch (IOException e)
     {
@@ -545,6 +547,7 @@
     }
 
     dbEnv.shutdown();
+    DirectoryServer.deregisterConfigurableComponent(this);
   }
 
 

--
Gitblit v1.10.0