From 97ce72a97efb57a5dbfb759ac8144c0890583068 Mon Sep 17 00:00:00 2001 From: Eli Collins Date: Fri, 27 Aug 2010 02:53:20 +0000 Subject: [PATCH] HADOOP-6833. IPC leaks call parameters when exceptions thrown. Contributed by Todd Lipcon. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@989999 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES.txt | 3 +++ src/java/org/apache/hadoop/ipc/Client.java | 1 + 2 files changed, 4 insertions(+) diff --git a/CHANGES.txt b/CHANGES.txt index f2114f85fdb..a17d4ed0439 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -214,6 +214,9 @@ Trunk (unreleased changes) HADOOP-6925. BZip2Codec incorrectly implements read(). (Todd Lipcon via Eli Collins) + HADOOP-6833. IPC leaks call parameters when exceptions thrown. + (Todd Lipcon via Eli Collins) + Release 0.21.0 - Unreleased INCOMPATIBLE CHANGES diff --git a/src/java/org/apache/hadoop/ipc/Client.java b/src/java/org/apache/hadoop/ipc/Client.java index dddf16822bf..974df85bf71 100644 --- a/src/java/org/apache/hadoop/ipc/Client.java +++ b/src/java/org/apache/hadoop/ipc/Client.java @@ -765,6 +765,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),