Merge pull request #183 from DSL-UMD/distributed

[FIX] root dir
umd-dslam · Sep 23, 2019 · 514bc25 · 514bc25
2 parents a01c4ef + efd6017
commit 514bc25
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...fs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeMap.java b/...fs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeMap.java
@@ -57,7 +57,7 @@ public INode get(long id) {
     INode inode = INodeKeyedObjects.getCache().getIfPresent(Long.class, id);
     if (inode == null) {
       DatabaseINode.LoadINode node = new DatabaseINode().loadINode(id);
-      byte[] name = (node.name != null) ? DFSUtil.string2Bytes(node.name) : null;
+      byte[] name = (node.name != null && node.length > 0) ? DFSUtil.string2Bytes(node.name) : null;
       if (node.header != 0L) {
         inode = new INodeFile(node.id);
         inode.asFile().setNumBlocks();
@@ -98,7 +98,7 @@ public INode get(long parentId, String childName) {
             .getIfPresent(Pair.class, new ImmutablePair<>((Long) parentId, childName));
     if (inode == null) {
       DatabaseINode.LoadINode node = new DatabaseINode().loadINode(parentId, childName);
-      byte[] name = (node.name != null) ? DFSUtil.string2Bytes(node.name) : null;
+      byte[] name = (node.name != null && node.length > 0) ? DFSUtil.string2Bytes(node.name) : null;
       if (node.header != 0L) {
         inode = new INodeFile(node.id);
         inode.asFile().setNumBlocks();