From c8d65e08fa9cdfe3d8522a90157438f4eaeedeec Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 22 May 2014 19:37:23 -0400
Subject: [PATCH] Merged #83 "Fix cache miss in repository model retrieval"
---
src/main/bugtraq/com/syntevo/bugtraq/BugtraqFormatter.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/bugtraq/com/syntevo/bugtraq/BugtraqFormatter.java b/src/main/bugtraq/com/syntevo/bugtraq/BugtraqFormatter.java
index 978cd8c..5bb2c1c 100644
--- a/src/main/bugtraq/com/syntevo/bugtraq/BugtraqFormatter.java
+++ b/src/main/bugtraq/com/syntevo/bugtraq/BugtraqFormatter.java
@@ -59,10 +59,6 @@
for (BugtraqEntry entry : config.getEntries()) {
final List<BugtraqParserIssueId> ids = entry.getParser().parse(message);
- if (ids == null) {
- continue;
- }
-
for (BugtraqParserIssueId id : ids) {
allIds.add(new IssueId(entry, id));
}
@@ -76,8 +72,15 @@
}
appendText(message.substring(lastIdEnd + 1, id.getFrom()), outputHandler);
+ final String logLinkText = issueId.entry.getLogLinkText();
+ final String linkText;
+ if (logLinkText != null) {
+ linkText = logLinkText.replace("%BUGID%", id.getId());
+ }
+ else {
+ linkText = message.substring(id.getFrom(), id.getTo() + 1);
+ }
- final String linkText = message.substring(id.getFrom(), id.getTo() + 1);
final String target = issueId.entry.getUrl().replace("%BUGID%", id.getId());
outputHandler.appendLink(linkText, target);
lastIdEnd = id.getTo();
--
Gitblit v1.9.1