From fbe265fa787e4be9cb63c6bae2ef30b9400d9afc Mon Sep 17 00:00:00 2001
From: Simon Harrer <simon.harrer@gmail.com>
Date: Thu, 18 Jul 2013 10:11:04 -0400
Subject: [PATCH] Fixes findbugs warning - dereferencing null in exception case
---
src/main/java/com/gitblit/wicket/WicketUtils.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/WicketUtils.java b/src/main/java/com/gitblit/wicket/WicketUtils.java
index 91686b6..87f2f3f 100644
--- a/src/main/java/com/gitblit/wicket/WicketUtils.java
+++ b/src/main/java/com/gitblit/wicket/WicketUtils.java
@@ -431,7 +431,7 @@
}
public static int getDaysBack(PageParameters params) {
- return params.getInt("db", 14);
+ return params.getInt("db", 0);
}
public static String getUsername(PageParameters params) {
@@ -520,9 +520,9 @@
dateString = df.format(date);
}
String title = null;
- if (TimeUtils.isToday(date)) {
+ if (TimeUtils.isToday(date, timeZone)) {
title = timeUtils.today();
- } else if (TimeUtils.isYesterday(date)) {
+ } else if (TimeUtils.isYesterday(date, timeZone)) {
title = timeUtils.yesterday();
} else if (date.getTime() <= System.currentTimeMillis()) {
// past
--
Gitblit v1.9.1