From a5ec6df324f259f7e0bbab6144a804c3a85620f4 Mon Sep 17 00:00:00 2001
From: Jonathan Turner Eagles <jeagles@apache.org>
Date: Wed, 18 Dec 2013 17:02:58 +0000
Subject: [PATCH] HADOOP-10171. TestRPC fails intermittently on jkd7 (Mit Desai
 via jeagles)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1552024 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-common-project/hadoop-common/CHANGES.txt                 | 2 ++
 .../src/test/java/org/apache/hadoop/ipc/TestRPC.java            | 1 +
 2 files changed, 3 insertions(+)

diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 9a65867de87..9baee82ef0e 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -477,6 +477,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
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java
index f6917d2159a..33d1f68d4ad 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java
@@ -957,6 +957,7 @@ public void testConnectionPing() throws Exception {
       proxy.sleep(pingInterval*4);
     } finally {
       if (proxy != null) RPC.stopProxy(proxy);
+      server.stop();
     }
   }