You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by xy...@apache.org on 2017/06/08 20:06:31 UTC
[49/50] [abbrv] hadoop git commit: HDFS-11953. Remove Guava v21 usage
from HDFS-7240. Contributed by Xiaoyu Yao.
HDFS-11953. Remove Guava v21 usage from HDFS-7240. Contributed by Xiaoyu Yao.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2ec6464a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2ec6464a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2ec6464a
Branch: refs/heads/HDFS-7240
Commit: 2ec6464a1d8c6c9fdb80b0fb2caa30473dd37608
Parents: 25e6378
Author: Xiaoyu Yao <xy...@apache.org>
Authored: Thu Jun 8 10:43:55 2017 -0700
Committer: Xiaoyu Yao <xy...@apache.org>
Committed: Thu Jun 8 10:44:53 2017 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/fs/FileUtil.java | 5 ++---
.../src/main/java/org/apache/hadoop/ozone/OzoneClientUtils.java | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2ec6464a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java
index 4e0be30..3ab5483 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java
@@ -19,7 +19,6 @@
package org.apache.hadoop.fs;
import com.google.common.base.Preconditions;
-import com.google.common.base.Verify;
import org.apache.commons.collections.map.CaseInsensitiveMap;
import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
@@ -637,8 +636,8 @@ public class FileUtil {
}
}
// Exit condition -- ZipFile must exist.
- Verify.verify(archiveName.exists(), "Expected archive file missing: {}",
- archiveName.toPath());
+ Preconditions.checkState(archiveName.exists(),
+ "Expected archive file missing: {}", archiveName.toPath());
long crc32 = checksum.getChecksum().getValue();
checksum.close();
return crc32;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2ec6464a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/OzoneClientUtils.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/OzoneClientUtils.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/OzoneClientUtils.java
index f38dd7e..e337d12 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/OzoneClientUtils.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/OzoneClientUtils.java
@@ -382,7 +382,7 @@ public final class OzoneClientUtils {
if ((value == null) || value.isEmpty()) {
return Optional.absent();
}
- return Optional.of(HostAndPort.fromString(value).getHost());
+ return Optional.of(HostAndPort.fromString(value).getHostText());
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org