code: Fix NPE when access nonexistent path

NPE occured when access a file or a directory that does not exist or root directory of an empty commit.
naver · Mar 10, 2015 · f739919 · f739919
1 parent 7cdea2e
commit f739919
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/app/controllers/CodeApp.java b/app/controllers/CodeApp.java
@@ -98,6 +98,10 @@ public static Result codeBrowserWithBranch(String userName, String projectName,
         List<ObjectNode> recursiveData = RepositoryService.getMetaDataFromAncestorDirectories(
                 repository, branch, path);
 
+        if (recursiveData == null) {
+            return notFound(ErrorViews.NotFound.render());
+        }
+
         return ok(view.render(project, branches, recursiveData, branch, path));
     }
 

diff --git a/app/playRepository/RepositoryService.java b/app/playRepository/RepositoryService.java
@@ -86,12 +86,18 @@ public static List<ObjectNode> getMetaDataFromAncestorDirectories(PlayRepository
         ObjectNode metaData;
 
         metaData = repository.getMetaDataFromPath(branch, "");
+        if (metaData == null) {
+            return null;
+        }
         metaData.put("path", "");
         recursiveData.add(metaData);
         for(int i = 0; i < pathLength; i++){
             partialPath = (partialPath.equals("")) ? pathArray[i] : partialPath + "/" + pathArray[i];
             if (!repository.isIntermediateFolder(partialPath)) {
                 metaData = repository.getMetaDataFromPath(branch, partialPath);
+                if (metaData == null) {
+                    return null;
+                }
                 metaData.put("path", partialPath);
                 recursiveData.add(metaData);
             }