This is an automated email from the ASF dual-hosted git repository.
iwasakims pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 62c26b9 HDFS-15298 Fix the findbugs warnings introduced in HDFS-15217
(#1979)
62c26b9 is described below
commit 62c26b91fd06f505a6e64fd32a36e5e67d06fa30
Author: Toshihiro Suzuki <[email protected]>
AuthorDate: Mon Apr 27 17:20:47 2020 +0900
HDFS-15298 Fix the findbugs warnings introduced in HDFS-15217 (#1979)
---
.../java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
index 38d098e..2334e7b 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
@@ -3210,6 +3210,7 @@ public class FSNamesystem implements Namesystem,
FSNamesystemMBean,
logAuditEvent(false, operationName, src, dst, null);
throw e;
}
+ assert ret != null;
boolean success = ret.success;
if (success) {
getEditLog().logSync();
@@ -3244,7 +3245,7 @@ public class FSNamesystem implements Namesystem,
FSNamesystemMBean,
throw e;
}
getEditLog().logSync();
-
+ assert res != null;
BlocksMapUpdateInfo collectedBlocks = res.collectedBlocks;
if (!collectedBlocks.getToDeleteList().isEmpty()) {
removeBlocks(collectedBlocks);
@@ -7441,6 +7442,7 @@ public class FSNamesystem implements Namesystem,
FSNamesystemMBean,
throw ace;
}
getEditLog().logSync();
+ assert effectiveDirective != null;
effectiveDirectiveStr = effectiveDirective.toString();
logAuditEvent(true, operationName, effectiveDirectiveStr);
return effectiveDirective.getId();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
