HADOOP-10395. Merging r1576142 from branch-2 to branch-2.4.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.4@1576144 13f79535-47bb-0310-9956-ffa450edef68

hadoop-common-project/hadoop-common/CHANGES.txt

@@ -92,6 +92,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)

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestCallQueueManager.java

@@ -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);
     }