From a00e725a364e9eb859ca8ed2c914e6637c94cb9d Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Thu, 29 Mar 2007 21:12:30 +0000
Subject: [PATCH] Back out the commit included in revision 1539 because it does not build properly (it appears to reference classes that are not in the repository).
---
opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/SocketSession.java | 14 ++------------
1 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/SocketSession.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/SocketSession.java
index d1ceb76..b57cc5d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/SocketSession.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/SocketSession.java
@@ -112,16 +112,11 @@
/* Read the first 8 bytes containing the packet length */
int length = 0;
- /* Let's start the stop-watch before waiting on read */
- /* for the heartbeat check to be operationnal */
- lastReceiveTime = System.currentTimeMillis();
-
while (length<8)
{
int read = input.read(rcvLengthBuf, length, 8-length);
if (read == -1)
{
- lastReceiveTime=0;
throw new IOException("no more data");
}
else
@@ -140,9 +135,8 @@
{
length += input.read(buffer, length, totalLength - length);
}
- /* We do not want the heartbeat to close the session when */
- /* we are processing a message even a time consuming one. */
- lastReceiveTime=0;
+
+ lastReceiveTime = System.currentTimeMillis();
return SynchronizationMessage.generateMsg(buffer);
}
catch (OutOfMemoryError e)
@@ -165,10 +159,6 @@
*/
public long getLastReceiveTime()
{
- if (lastReceiveTime==0)
- {
- return System.currentTimeMillis();
- }
return lastReceiveTime;
}
--
Gitblit v1.10.0