Merge pull request #1757 from vladak/latest_history_fix

getLatestRevision() fix

Author: tarzanek

src/org/opensolaris/opengrok/web/PageConfig.java

@@ -1193,15 +1193,15 @@ public File findDataFile() {
                 path, env.isCompressXref());
     }
 
-    private String getLatestRevision() {
-        if (!env.isHistoryEnabled()) {
+    protected String getLatestRevision() {
+        if (!getEnv().isHistoryEnabled()) {
             return null;
         }
 
         History hist;
         try {
             hist = HistoryGuru.getInstance().
-                    getHistory(new File(env.getSourceRootFile(), path));
+                    getHistory(new File(getEnv().getSourceRootFile(), getPath()));
         } catch (HistoryException ex) {
             return null;
         }
@@ -1210,7 +1210,16 @@ private String getLatestRevision() {
             return null;
         }
 
-        HistoryEntry he = hist.getHistoryEntries().get(0);
+        List<HistoryEntry> hlist = hist.getHistoryEntries();
+        if (hlist == null) {
+            return null;
+        }
+
+        if (hlist.size() == 0) {
+            return null;
+        }
+
+        HistoryEntry he = hlist.get(0);
         if (he == null) {
             return null;
         }
@@ -1234,12 +1243,17 @@ public boolean isLatestRevision(String rev) {
      */
     public String getLatestRevisionLocation() {
         StringBuilder sb = new StringBuilder();
+        String revStr;
+
+        if ((revStr = getLatestRevision()) == null) {
+            return null;
+        }
 
         sb.append(req.getContextPath());
         sb.append(Prefix.XREF_P);
         sb.append(Util.URIEncodePath(path));
         sb.append("?r=");
-        sb.append(Util.URIEncode(getLatestRevision()));
+        sb.append(Util.URIEncode(revStr));
 
         return sb.toString();
     }

test/org/opensolaris/opengrok/web/PageConfigTest.java

@@ -241,6 +241,38 @@ public String getParameter(String name) {
         }
     }
 
+    @Test
+    public void testGetLatestRevisionValid() {
+        DummyHttpServletRequest req1 = new DummyHttpServletRequest() {
+            @Override
+                public String getPathInfo() {
+                    return "/git/main.c";
+            }
+        };
+
+        PageConfig cfg = PageConfig.get(req1);
+        String rev = cfg.getLatestRevision();
+
+        assertEquals("aa35c258", rev);
+    }
+
+    @Test
+    public void testGetLatestRevisionNotValid() {
+        DummyHttpServletRequest req2 = new DummyHttpServletRequest() {
+            @Override
+                public String getPathInfo() {
+                    return "/git/nonexistent_file";
+            }
+        };
+
+        PageConfig cfg = PageConfig.get(req2);
+        String rev = cfg.getLatestRevision();
+        assertNull(rev);
+
+        String location = cfg.getLatestRevisionLocation();
+        assertNull(location);
+    }
+
     @Test
     public void testGetRequestedRevision() {
         final String[] params = {"r", "h", "r", "r", "r"};