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

[jeagles]

Author: jeagles
Date: Wed Dec 18 17:12:23 2013
New Revision: 1552033

URL: http://svn.apache.org/r1552033
Log:
HADOOP-10171. TestRPC fails intermittently on jkd7 (Mit Desai via jeagles)

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/TestRPC.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=1552033&r1=1552032&r2=1552033&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 
Wed Dec 18 17:12:23 2013
@@ -188,6 +188,8 @@ Release 2.4.0 - UNRELEASED
     HADOOP-9611 mvn-rpmbuild against google-guice > 3.0 yields missing cglib
     dependency (Timothy St. Clair via stevel)
 
+    HADOOP-10171. TestRPC fails intermittently on jkd7 (Mit Desai via jeagles)
+
 Release 2.3.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java?rev=1552033&r1=1552032&r2=1552033&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java
 Wed Dec 18 17:12:23 2013
@@ -864,6 +864,8 @@ public class TestRPC {
       }
       // clear interrupt status for future tests
       Thread.interrupted();
+    } finally {
+      server.stop();
     }
   }
   
@@ -929,6 +931,7 @@ public class TestRPC {
     
     // should not cause any other thread to get an error
     assertTrue("rpc got exception " + error.get(), error.get() == null);
+    server.stop();
   }
 
   @Test
@@ -950,6 +953,7 @@ public class TestRPC {
       proxy.sleep(pingInterval*4);
     } finally {
       if (proxy != null) RPC.stopProxy(proxy);
+      server.stop();
     }
   }