You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by dh...@apache.org on 2008/01/25 07:56:53 UTC
svn commit: r615129 -
/hadoop/core/trunk/src/java/org/apache/hadoop/dfs/DataNode.java
Author: dhruba
Date: Thu Jan 24 22:56:51 2008
New Revision: 615129
URL: http://svn.apache.org/viewvc?rev=615129&view=rev
Log:
HADOOP-2691. The previous checkin of this patch needed a manual
merge. Here it is.
Modified:
hadoop/core/trunk/src/java/org/apache/hadoop/dfs/DataNode.java
Modified: hadoop/core/trunk/src/java/org/apache/hadoop/dfs/DataNode.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/java/org/apache/hadoop/dfs/DataNode.java?rev=615129&r1=615128&r2=615129&view=diff
==============================================================================
--- hadoop/core/trunk/src/java/org/apache/hadoop/dfs/DataNode.java (original)
+++ hadoop/core/trunk/src/java/org/apache/hadoop/dfs/DataNode.java Thu Jan 24 22:56:51 2008
@@ -1709,7 +1709,7 @@
while (running && shouldRun && ackQueue.size() == 0) {
long idle = now - lastHeartbeat;
long timeout = (socketTimeout/2) - idle;
- if (timeout < 0) {
+ if (timeout <= 0) {
timeout = 1000;
}
try {