HADOOP-10171. TestRPC fails intermittently on jkd7 (Mit Desai via jeagles)

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

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

@@ -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

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

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