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 ae...@apache.org on 2018/03/15 17:49:40 UTC

[17/22] hadoop git commit: HDFS-13261. Fix incorrect null value check. Contributed by Jianfei Jiang.

HDFS-13261. Fix incorrect null value check. Contributed by Jianfei Jiang.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3a0f4bc0
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3a0f4bc0
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3a0f4bc0

Branch: refs/heads/HDFS-7240
Commit: 3a0f4bc0d513f9ffb4cf571c1ac85395e116fdcc
Parents: e840b4a
Author: Yiqun Lin <yq...@apache.org>
Authored: Thu Mar 15 11:06:04 2018 +0800
Committer: Yiqun Lin <yq...@apache.org>
Committed: Thu Mar 15 11:06:04 2018 +0800

----------------------------------------------------------------------
 .../org/apache/hadoop/hdfs/protocol/ZoneReencryptionStatus.java    | 2 +-
 .../src/main/java/org/apache/hadoop/hdfs/tools/AdminHelper.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/3a0f4bc0/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/ZoneReencryptionStatus.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/ZoneReencryptionStatus.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/ZoneReencryptionStatus.java
index 9022b9f..c7628d8 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/ZoneReencryptionStatus.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/ZoneReencryptionStatus.java
@@ -223,7 +223,7 @@ public class ZoneReencryptionStatus {
    * a listReencryptionStatus call, for the crypto admin to consume.
    */
   public void setZoneName(final String name) {
-    Preconditions.checkNotNull(name == null);
+    Preconditions.checkNotNull(name, "zone name cannot be null");
     zoneName = name;
   }
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/3a0f4bc0/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/AdminHelper.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/AdminHelper.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/AdminHelper.java
index 2c5fb0e..391dcb6 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/AdminHelper.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/AdminHelper.java
@@ -145,7 +145,7 @@ public class AdminHelper {
     private final Command[] commands;
 
     public HelpCommand(Command[] commands) {
-      Preconditions.checkNotNull(commands != null);
+      Preconditions.checkNotNull(commands, "commands cannot be null.");
       this.commands = commands;
     }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org