From cb285cbfddfc0b633d6b8cdb4dc0d2bd2b8b51ef Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 05 Jan 2012 17:34:05 -0500
Subject: [PATCH] Fixed bug in receive hook for repositories in subfolders
---
src/com/gitblit/models/FeedModel.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/com/gitblit/models/FeedModel.java b/src/com/gitblit/models/FeedModel.java
index d553585..08f9e48 100644
--- a/src/com/gitblit/models/FeedModel.java
+++ b/src/com/gitblit/models/FeedModel.java
@@ -29,7 +29,8 @@
public String repository;
public String branch;
- public Date lastRefresh;
+ public Date lastRefreshDate;
+ public Date currentRefreshDate;
public boolean subscribed;
@@ -42,7 +43,8 @@
public FeedModel(String definition) {
subscribed = true;
- lastRefresh = new Date(0);
+ lastRefreshDate = new Date(0);
+ currentRefreshDate = new Date(0);
String[] fields = definition.split(":");
repository = fields[0];
@@ -76,7 +78,7 @@
@Override
public int hashCode() {
- return (repository + (StringUtils.isEmpty(branch) ? "" : branch)).toLowerCase().hashCode();
+ return toString().toLowerCase().hashCode();
}
@Override
--
Gitblit v1.9.1