Merge HADOOP-6833 (r990003) into branch-0.20-security

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

CHANGES.txt

@@ -5,9 +5,12 @@ Release 0.20.205.0 - unreleased
   NEW FEATURES
 
   BUG FIXES
+
+    HADOOP-6833. IPC leaks call parameters when exceptions thrown.
+    (Todd Lipcon via Eli Collins)
   
-  HADOOP-7400. Fix HdfsProxyTests fails when the -Dtest.build.dir 
-	and -Dbuild.test is set a dir other than build dir (gkesavan).
+    HADOOP-7400. Fix HdfsProxyTests fails when the -Dtest.build.dir 
+    and -Dbuild.test is set a dir other than build dir (gkesavan).
 
   IMPROVEMENTS
 

src/core/org/apache/hadoop/ipc/Client.java

@@ -780,6 +780,7 @@ public class Client {
         } else if (state == Status.ERROR.state) {
           call.setException(new RemoteException(WritableUtils.readString(in),
                                                 WritableUtils.readString(in)));
+          calls.remove(id);
         } else if (state == Status.FATAL.state) {
           // Close the connection
           markClosed(new RemoteException(WritableUtils.readString(in),