From dd42848d75ca5e982f5811d5f7490cc1f216a086 Mon Sep 17 00:00:00 2001 From: Tsz-wo Sze Date: Thu, 12 Jan 2012 07:23:53 +0000 Subject: [PATCH] svn merge -c 1179512 from trunk for HADOOP-7695. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1230422 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../hadoop-common/src/main/java/org/apache/hadoop/ipc/RPC.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 0a4fe36922a..4cf6e3140b4 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -36,6 +36,9 @@ Release 0.23-PB - Unreleased BUG FIXES + HADOOP-7695. RPC.stopProxy can throw unintended exception while logging + error (atm) + HADOOP-7833. Fix findbugs warnings in protobuf generated code. (John Lee via suresh) diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RPC.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RPC.java index 27fd483e35a..cf597468682 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RPC.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RPC.java @@ -567,7 +567,8 @@ public static void stopProxy(Object proxy) { } } else { LOG.error("Could not get invocation handler " + invocationHandler + - " for proxy " + proxy + ", or invocation handler is not closeable."); + " for proxy class " + (proxy == null ? null : proxy.getClass()) + + ", or invocation handler is not closeable."); } }