You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@giraph.apache.org by er...@apache.org on 2012/09/13 04:47:38 UTC

svn commit: r1384193 - in /giraph/trunk: CHANGELOG src/main/java/org/apache/giraph/comm/netty/NettyClient.java

Author: ereisman
Date: Thu Sep 13 02:47:37 2012
New Revision: 1384193

URL: http://svn.apache.org/viewvc?rev=1384193&view=rev
Log:
GIRAPH-323 Check if requests are done before calling wait (majakabiljo via ereisman)

Modified:
    giraph/trunk/CHANGELOG
    giraph/trunk/src/main/java/org/apache/giraph/comm/netty/NettyClient.java

Modified: giraph/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/giraph/trunk/CHANGELOG?rev=1384193&r1=1384192&r2=1384193&view=diff
==============================================================================
--- giraph/trunk/CHANGELOG (original)
+++ giraph/trunk/CHANGELOG Thu Sep 13 02:47:37 2012
@@ -1,6 +1,8 @@
 Giraph Change Log
 
 Release 0.2.0 - unreleased
+  GIRAPH-323: Check if requests are done before calling wait (majakabiljo
+  via ereisman)
 
   GIRAPH-298: Reduce timeout for TestAutoCheckpoint. (majakabiljo via
   aching)

Modified: giraph/trunk/src/main/java/org/apache/giraph/comm/netty/NettyClient.java
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/comm/netty/NettyClient.java?rev=1384193&r1=1384192&r2=1384193&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/comm/netty/NettyClient.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/comm/netty/NettyClient.java Thu Sep 13 02:47:37 2012
@@ -488,6 +488,9 @@ public class NettyClient {
         }
       }
       synchronized (clientRequestIdRequestInfoMap) {
+        if (clientRequestIdRequestInfoMap.size() <= maxOpenRequests) {
+          break;
+        }
         try {
           clientRequestIdRequestInfoMap.wait(waitingRequestMsecs);
         } catch (InterruptedException e) {