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 CE013200D14 for ; Tue, 3 Oct 2017 19:06:51 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id BDA9F1609DE; Tue, 3 Oct 2017 17:06:41 +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 100951609BD for ; Tue, 3 Oct 2017 19:06:40 +0200 (CEST) Received: (qmail 54928 invoked by uid 500); 3 Oct 2017 17:06:12 -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 54335 invoked by uid 99); 3 Oct 2017 17:06:11 -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; Tue, 03 Oct 2017 17:06:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E3028F5C60; Tue, 3 Oct 2017 17:06:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aengineer@apache.org To: common-commits@hadoop.apache.org Date: Tue, 03 Oct 2017 17:06:33 -0000 Message-Id: <6cc1e978187f443990963e36cfbf54b2@git.apache.org> In-Reply-To: <373f04fbbe3445a68f64b21980cd4bab@git.apache.org> References: <373f04fbbe3445a68f64b21980cd4bab@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [24/35] hadoop git commit: HADOOP-14915. method name is incorrect in ConfServlet. Contributed by Bharat Viswanadham. archived-at: Tue, 03 Oct 2017 17:06:52 -0000 HADOOP-14915. method name is incorrect in ConfServlet. Contributed by Bharat Viswanadham. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/563dcdfc Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/563dcdfc Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/563dcdfc Branch: refs/heads/HDFS-7240 Commit: 563dcdfc1de7ea9ee7ce296163cf2678dfe5349c Parents: 06df6ab Author: Chen Liang Authored: Mon Oct 2 10:58:19 2017 -0700 Committer: Chen Liang Committed: Mon Oct 2 10:58:19 2017 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/conf/ConfServlet.java | 4 ++-- .../src/test/java/org/apache/hadoop/conf/TestConfServlet.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/563dcdfc/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ConfServlet.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ConfServlet.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ConfServlet.java index cfd7b97..2128de7 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ConfServlet.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ConfServlet.java @@ -69,7 +69,7 @@ public class ConfServlet extends HttpServlet { return; } - String format = parseAccecptHeader(request); + String format = parseAcceptHeader(request); if (FORMAT_XML.equals(format)) { response.setContentType("text/xml; charset=utf-8"); } else if (FORMAT_JSON.equals(format)) { @@ -89,7 +89,7 @@ public class ConfServlet extends HttpServlet { } @VisibleForTesting - static String parseAccecptHeader(HttpServletRequest request) { + static String parseAcceptHeader(HttpServletRequest request) { String format = request.getHeader(HttpHeaders.ACCEPT); return format != null && format.contains(FORMAT_JSON) ? FORMAT_JSON : FORMAT_XML; http://git-wip-us.apache.org/repos/asf/hadoop/blob/563dcdfc/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfServlet.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfServlet.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfServlet.java index 53089ed..cf42219 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfServlet.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfServlet.java @@ -98,7 +98,7 @@ public class TestConfServlet { Mockito.when(request.getHeader(HttpHeaders.ACCEPT)) .thenReturn(contentTypeExpected); assertEquals(contenTypeActual, - ConfServlet.parseAccecptHeader(request)); + ConfServlet.parseAcceptHeader(request)); } } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org