HDFS-5510. Fix a findbug warning in DataStorage.java on HDFS-2832 branch. (Contributed by Junping Du)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1542006 13f79535-47bb-0310-9956-ffa450edef68

hadoop-hdfs-project/hadoop-hdfs/CHANGES_HDFS-2832.txt

@@ -104,3 +104,6 @@ IMPROVEMENTS:
     HDFS-5501. Fix pendingReceivedRequests tracking in BPServiceActor. (Arpit
     Agarwal)
 
+    HDFS-5510. Fix a findbug warning in DataStorage.java on HDFS-2832 branch.
+    (Junping Du via Arpit Agarwal)
+

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java

@@ -291,9 +291,10 @@ public class DataStorage extends Storage {
     props.setProperty("layoutVersion", String.valueOf(layoutVersion));
     props.setProperty("storageID", sd.getStorageUuid());
 
+    String datanodeUuid = getDatanodeUuid();
     if (LayoutVersion.supports(Feature.ADD_DATANODE_AND_STORAGE_UUIDS,
           layoutVersion) && datanodeUuid != null) {
-      props.setProperty("datanodeUuid", getDatanodeUuid());
+      props.setProperty("datanodeUuid", datanodeUuid);
     }
 
     // Set NamespaceID in version before federation