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 D48EA200CF3 for ; Wed, 13 Sep 2017 19:59:18 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id D35511609CA; Wed, 13 Sep 2017 17:59:18 +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 F3A371609C3 for ; Wed, 13 Sep 2017 19:59:17 +0200 (CEST) Received: (qmail 21696 invoked by uid 500); 13 Sep 2017 17:59:15 -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 21683 invoked by uid 99); 13 Sep 2017 17:59:15 -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; Wed, 13 Sep 2017 17:59:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 76CF9F56C6; Wed, 13 Sep 2017 17:59:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: wang@apache.org To: common-commits@hadoop.apache.org Message-Id: <75b770711ce24b899d3cdc48e52a771f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: HADOOP-14857. Fix downstream shaded client integration test. Contributed by Sean Busbey. Date: Wed, 13 Sep 2017 17:59:15 +0000 (UTC) archived-at: Wed, 13 Sep 2017 17:59:19 -0000 Repository: hadoop Updated Branches: refs/heads/branch-3.0 d1fcab3ea -> 7b6b2dc93 HADOOP-14857. Fix downstream shaded client integration test. Contributed by Sean Busbey. (cherry picked from commit 8277fab2be3b0898ba326d15e4cb641da2ac51ce) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7b6b2dc9 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7b6b2dc9 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7b6b2dc9 Branch: refs/heads/branch-3.0 Commit: 7b6b2dc93ae038e909fa0ad25c6cc8b5f9feda63 Parents: d1fcab3 Author: Andrew Wang Authored: Wed Sep 13 10:59:04 2017 -0700 Committer: Andrew Wang Committed: Wed Sep 13 10:59:08 2017 -0700 ---------------------------------------------------------------------- .../apache/hadoop/example/ITUseMiniCluster.java | 4 +++- .../hadoop-client-minicluster/pom.xml | 21 ++++++++++++++++++++ .../org/apache/hadoop/http/HttpServer2.java | 1 + pom.xml | 2 +- 4 files changed, 26 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/7b6b2dc9/hadoop-client-modules/hadoop-client-integration-tests/src/test/java/org/apache/hadoop/example/ITUseMiniCluster.java ---------------------------------------------------------------------- diff --git a/hadoop-client-modules/hadoop-client-integration-tests/src/test/java/org/apache/hadoop/example/ITUseMiniCluster.java b/hadoop-client-modules/hadoop-client-integration-tests/src/test/java/org/apache/hadoop/example/ITUseMiniCluster.java index 5fcbe13..6022fbc 100644 --- a/hadoop-client-modules/hadoop-client-integration-tests/src/test/java/org/apache/hadoop/example/ITUseMiniCluster.java +++ b/hadoop-client-modules/hadoop-client-integration-tests/src/test/java/org/apache/hadoop/example/ITUseMiniCluster.java @@ -77,7 +77,9 @@ public class ITUseMiniCluster { @After public void clusterDown() { - cluster.close(); + if (cluster != null) { + cluster.close(); + } } @Test http://git-wip-us.apache.org/repos/asf/hadoop/blob/7b6b2dc9/hadoop-client-modules/hadoop-client-minicluster/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-client-modules/hadoop-client-minicluster/pom.xml b/hadoop-client-modules/hadoop-client-minicluster/pom.xml index 5cf1fad..553a98a 100644 --- a/hadoop-client-modules/hadoop-client-minicluster/pom.xml +++ b/hadoop-client-modules/hadoop-client-minicluster/pom.xml @@ -75,6 +75,9 @@ provided --> + org.apache.hadoop hadoop-minicluster @@ -282,6 +285,12 @@ + + + org.mockito + mockito-all + true + @@ -635,6 +644,18 @@ testshell/* + + + org.mockito:mockito-all + + asm-license.txt + cglib-license.txt + hamcrest-license.txt + objenesis-license.txt + org/hamcrest/**/*.class + org/hamcrest/*.class + + http://git-wip-us.apache.org/repos/asf/hadoop/blob/7b6b2dc9/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java index a450f66..fb49d2d 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java @@ -1200,6 +1200,7 @@ public final class HttpServer2 implements FilterContainer { * @throws Exception */ void openListeners() throws Exception { + LOG.debug("opening listeners: {}", listeners); for (ServerConnector listener : listeners) { if (listener.getLocalPort() != -1 && listener.getLocalPort() != -2) { // This listener is either started externally or has been bound or was http://git-wip-us.apache.org/repos/asf/hadoop/blob/7b6b2dc9/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 3fded0f..c0a863b 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs 1.5 1.7 2.4 - 2.10 + 3.0.1 3.0.0-M1 2.10.4 1.5 --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org