code: Fix svn repository code browsing cache bug

yona-projects · Apr 25, 2017 · 7f065fe · 7f065fe
1 parent 7a57e89
commit 7f065fe
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/app/controllers/CodeApp.java b/app/controllers/CodeApp.java
@@ -96,13 +96,22 @@ public static Result codeBrowserWithBranch(String owner, String projectName, Str
 
         PlayRepository repository = RepositoryService.getRepository(project);
         List<String> branches = repository.getRefNames();
-        String cacheKey = owner + ":" + projectName + ":" + branch + ":" + path + ":" + project.lastUpdateDate().getTime();
-        List<ObjectNode> recursiveData = (List<ObjectNode>) Cache.get(cacheKey);
-        if( recursiveData == null){
+        List<ObjectNode> recursiveData = null;
+
+        if(RepositoryService.VCS_GIT.equals(project.vcs)){
+            String cacheKey = owner + ":" + projectName + ":" + branch + ":" + path + ":" + project.lastUpdateDate().getTime();
+
+            recursiveData = (List<ObjectNode>) Cache.get(cacheKey);
+            if( recursiveData == null){
+                recursiveData = RepositoryService.getMetaDataFromAncestorDirectories(
+                        repository, branch, path);
+                Cache.set(cacheKey, recursiveData);
+            }
+        } else if (RepositoryService.VCS_SUBVERSION.equals(project.vcs)){  // svn doesn't use cache
             recursiveData = RepositoryService.getMetaDataFromAncestorDirectories(
                     repository, branch, path);
-            Cache.set(cacheKey, recursiveData);
         }
+
         if (recursiveData == null) {
             return notFound(ErrorViews.NotFound.render(branch, project, "code"));
         }