"Report Bug" URL can never be null
The config provider will always provide a value. Either the
value given by the user in gerrit.config, or the default value.
Change-Id: I9b7107857c79f939ed5315e52610277b05ef7d67
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java
index f9acc8c..c3dd270 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java
@@ -463,15 +463,14 @@
btmmenu.add(new InlineLabel(C.keyHelp()));
btmmenu.add(new InlineLabel(" | "));
btmmenu.add(new InlineHTML(M.poweredBy(vs)));
- if (getConfig().getReportBugUrl() != null) {
- Anchor a = new Anchor(
- C.reportBug(),
- getConfig().getReportBugUrl());
- a.setTarget("_blank");
- a.setStyleName("");
- btmmenu.add(new InlineLabel(" | "));
- btmmenu.add(a);
- }
+
+ Anchor a = new Anchor(
+ C.reportBug(),
+ getConfig().getReportBugUrl());
+ a.setTarget("_blank");
+ a.setStyleName("");
+ btmmenu.add(new InlineLabel(" | "));
+ btmmenu.add(a);
}
private void onModuleLoad2(HostPageData hpd) {
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GerritConfigProvider.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GerritConfigProvider.java
index 0cfdf0e..4f0df25 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GerritConfigProvider.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GerritConfigProvider.java
@@ -129,12 +129,9 @@
config.setLargeChangeSize(cfg.getInt("change", "largeChange", 500));
config.setNewFeatures(cfg.getBoolean("gerrit", "enableNewFeatures", true));
- config.setReportBugUrl(cfg.getString("gerrit", null, "reportBugUrl"));
- if (config.getReportBugUrl() == null) {
- config.setReportBugUrl("http://code.google.com/p/gerrit/issues/list");
- } else if (config.getReportBugUrl().isEmpty()) {
- config.setReportBugUrl(null);
- }
+ final String reportBugUrl = cfg.getString("gerrit", null, "reportBugUrl");
+ config.setReportBugUrl(reportBugUrl != null ?
+ reportBugUrl : "http://code.google.com/p/gerrit/issues/list");
config.setGitBasicAuth(authConfig.isGitBasicAuth());
