Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 11B4811787 for ; Thu, 7 Aug 2014 21:10:40 +0000 (UTC) Received: (qmail 63448 invoked by uid 500); 7 Aug 2014 21:10:39 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 63347 invoked by uid 500); 7 Aug 2014 21:10:39 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 63253 invoked by uid 99); 7 Aug 2014 21:10:39 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Aug 2014 21:10:39 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 71D8494AEB8; Thu, 7 Aug 2014 21:10:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Thu, 07 Aug 2014 21:10:41 -0000 Message-Id: <43e3a65228d643e5a38fd69a7536c909@git.apache.org> In-Reply-To: <0a0a42d2a14641c59d2dad8ab769817f@git.apache.org> References: <0a0a42d2a14641c59d2dad8ab769817f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/4] git commit: ACCUMULO-3052 Use a StringUtils method that isn't hadoop version dependent. ACCUMULO-3052 Use a StringUtils method that isn't hadoop version dependent. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/290866f2 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/290866f2 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/290866f2 Branch: refs/heads/1.6.1-SNAPSHOT Commit: 290866f256177488576544ff7bfc20fb618d1ca4 Parents: 1b459a0 Author: Josh Elser Authored: Thu Aug 7 17:02:33 2014 -0400 Committer: Josh Elser Committed: Thu Aug 7 17:07:48 2014 -0400 ---------------------------------------------------------------------- .../java/org/apache/accumulo/core/util/SslConnectionParams.java | 2 +- .../main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/290866f2/core/src/main/java/org/apache/accumulo/core/util/SslConnectionParams.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/util/SslConnectionParams.java b/core/src/main/java/org/apache/accumulo/core/util/SslConnectionParams.java index 652f768..dad6792 100644 --- a/core/src/main/java/org/apache/accumulo/core/util/SslConnectionParams.java +++ b/core/src/main/java/org/apache/accumulo/core/util/SslConnectionParams.java @@ -22,7 +22,7 @@ import java.net.URL; import org.apache.accumulo.core.conf.AccumuloConfiguration; import org.apache.accumulo.core.conf.Property; -import org.apache.hadoop.util.StringUtils; +import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.apache.thrift.transport.TSSLTransportFactory.TSSLTransportParameters; http://git-wip-us.apache.org/repos/asf/accumulo/blob/290866f2/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java ---------------------------------------------------------------------- diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java index 888913a..82cd436 100644 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java +++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java @@ -20,7 +20,7 @@ import javax.servlet.http.HttpServlet; import org.apache.accumulo.core.conf.AccumuloConfiguration; import org.apache.accumulo.core.conf.Property; -import org.apache.hadoop.util.StringUtils; +import org.apache.commons.lang.StringUtils; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.nio.SelectChannelConnector; import org.eclipse.jetty.server.session.SessionHandler;