svn commit: r1576142 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: CHANGES.txt src/test/java/org/apache/hadoop/ipc/TestCallQueueManager.java

[arp]

Author: arp
Date: Mon Mar 10 23:58:05 2014
New Revision: 1576142

URL: http://svn.apache.org/r1576142
Log:
HADOOP-10395. Merging r1575562 from trunk to branch-2.

Modified:
    
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
    
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestCallQueueManager.java

Modified: 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1576142&r1=1576141&r2=1576142&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt 
(original)
+++ 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt 
Mon Mar 10 23:58:05 2014
@@ -110,6 +110,8 @@ Release 2.4.0 - UNRELEASED
 
     HADOOP-10393. Fix the javac warnings in hadoop-auth.  (szetszwo)
 
+    HADOOP-10395. TestCallQueueManager is flaky. (Arpit Agarwal)
+
   BREAKDOWN OF HADOOP-10184 SUBTASKS AND RELATED JIRAS
 
     HADOOP-10185. FileSystem API for ACLs. (cnauroth)

Modified: 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestCallQueueManager.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestCallQueueManager.java?rev=1576142&r1=1576141&r2=1576142&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestCallQueueManager.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestCallQueueManager.java
 Mon Mar 10 23:58:05 2014
@@ -190,8 +190,6 @@ public class TestCallQueueManager {
 
     Thread.sleep(10);
 
-    assertTrue(manager.size() > 0);
-
     for (int i=0; i < 5; i++) {
       manager.swapQueue(LinkedBlockingQueue.class, 5000, "", null);
     }