HDFS-17637. [BackPort] Fix spotbugs in HttpFSFileSystem#getXAttr (#7099) Contributed by Hualong Zhang.

zhtttylz · zhtttylz · commit 81e3d4869515 · 2024-12-01T22:22:47.000+08:00
Reviewed-by: Shilun Fan &lt;slfan1989@apache.org&gt;
Signed-off-by: Shilun Fan &lt;slfan1989@apache.org&gt;
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/client/HttpFSFileSystem.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/client/HttpFSFileSystem.java
@@ -1370,7 +1370,7 @@ public byte[] getXAttr(Path f, String name) throws IOException {
     JSONObject json = (JSONObject) HttpFSUtils.jsonParse(conn);
     Map<String, byte[]> xAttrs = createXAttrMap(
         (JSONArray) json.get(XATTRS_JSON));
-    return xAttrs != null ? xAttrs.get(name) : null;
+    return xAttrs.get(name);
   }
 
   /** Convert xAttrs json to xAttrs map */

Original file line number	Diff line number	Diff line change
`@@ -1370,7 +1370,7 @@ public byte[] getXAttr(Path f, String name) throws IOException {`
`1370`	`1370`	`JSONObject json = (JSONObject) HttpFSUtils.jsonParse(conn);`
`1371`	`1371`	`Map<String, byte[]> xAttrs = createXAttrMap(`
`1372`	`1372`	`(JSONArray) json.get(XATTRS_JSON));`
`1373`		`- return xAttrs != null ? xAttrs.get(name) : null;`
	`1373`	`+ return xAttrs.get(name);`
`1374`	`1374`	`}`
`1375`	`1375`
`1376`	`1376`	`/** Convert xAttrs json to xAttrs map */`