Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 7F367200CB0 for ; Fri, 9 Jun 2017 06:34:52 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 7C3FC160BE5; Fri, 9 Jun 2017 04:34:52 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id C3324160BD5 for ; Fri, 9 Jun 2017 06:34:51 +0200 (CEST) Received: (qmail 30167 invoked by uid 500); 9 Jun 2017 04:34:50 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 30158 invoked by uid 99); 9 Jun 2017 04:34:50 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Jun 2017 04:34:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C10BADFE15; Fri, 9 Jun 2017 04:34:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jzhuge@apache.org To: common-commits@hadoop.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: HADOOP-14511. WritableRpcEngine.Invocation#toString NPE on null parameters. Contributed by John Zhuge. Date: Fri, 9 Jun 2017 04:34:50 +0000 (UTC) archived-at: Fri, 09 Jun 2017 04:34:52 -0000 Repository: hadoop Updated Branches: refs/heads/branch-2.8 72d895a11 -> a86081408 HADOOP-14511. WritableRpcEngine.Invocation#toString NPE on null parameters. Contributed by John Zhuge. (cherry picked from commit 87f4428de017e5bfc4358304728bd2281d501d52) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a8608140 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a8608140 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a8608140 Branch: refs/heads/branch-2.8 Commit: a86081408df2c8651d15be9d5375a785c00ed5b1 Parents: 72d895a Author: John Zhuge Authored: Thu Jun 8 21:31:00 2017 -0700 Committer: John Zhuge Committed: Thu Jun 8 21:31:00 2017 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/ipc/WritableRpcEngine.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a8608140/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/WritableRpcEngine.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/WritableRpcEngine.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/WritableRpcEngine.java index 12a3912..9ed710c 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/WritableRpcEngine.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/WritableRpcEngine.java @@ -182,10 +182,13 @@ public class WritableRpcEngine implements RpcEngine { StringBuilder buffer = new StringBuilder(); buffer.append(methodName); buffer.append("("); - for (int i = 0; i < parameters.length; i++) { - if (i != 0) - buffer.append(", "); - buffer.append(parameters[i]); + if (parameters != null) { + for (int i = 0; i < parameters.length; i++) { + if (i != 0) { + buffer.append(", "); + } + buffer.append(parameters[i]); + } } buffer.append(")"); buffer.append(", rpc version="+rpcVersion); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org