Fix potential NPE in creating a date label

diff --git a/src/main/java/com/gitblit/wicket/WicketUtils.java b/src/main/java/com/gitblit/wicket/WicketUtils.java
index f1f084c68ce4ba71db869a3acea5df19f180c074..bba3f79afbfe933f95f350456a4d4fa53799d667 100644 (file)
--- a/src/main/java/com/gitblit/wicket/WicketUtils.java
+++ b/src/main/java/com/gitblit/wicket/WicketUtils.java
@@ -434,7 +434,7 @@ public class WicketUtils {
                parameterMap.put("pg", String.valueOf(pageNumber));\r
                return new PageParameters(parameterMap);\r
        }\r
-       \r
+\r
        public static PageParameters newBlameTypeParameter(String repositoryName,\r
                        String commitId, String path, String blameType) {\r
                Map<String, String> parameterMap = new HashMap<String, String>();\r
@@ -536,7 +536,7 @@ public class WicketUtils {
                        // past\r
                        title = timeUtils.timeAgo(date);\r
                }\r
-               if ((System.currentTimeMillis() - date.getTime()) < 10 * 24 * 60 * 60 * 1000L) {\r
+               if (title != null && (System.currentTimeMillis() - date.getTime()) < 10 * 24 * 60 * 60 * 1000L) {\r
                        String tmp = dateString;\r
                        dateString = title;\r
                        title = tmp;\r