commit 98e3448b1aaaf54e0bddfe9f1a539b3056fb4339
author David Pursehouse <david.pursehouse@sonymobile.com> Thu Nov 26 10:04:27 2015 +0900
committer David Pursehouse <david.pursehouse@sonymobile.com> Mon Nov 30 11:56:45 2015 +0900
tree 9403a94adf3f0c02a062888fb5757793c3058b20
parent ae8141af068285c1f1be41fbe150a6e3d2c08b3e

ChangeCleanupConfig: Allow canonical web URL to be null

When the daemon is running in slave mode, the canonical web
URL does not need to be set.

Bug: Issue 3696
Change-Id: I62a90c284a8bef40618bae5e3c05baf75ea28ec3

gerrit-server/src/main/java/com/google/gerrit/server/config/ChangeCleanupConfig.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/ChangeCleanupConfig.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/ChangeCleanupConfig.java
index 37a6869..b4b1865 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/config/ChangeCleanupConfig.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/ChangeCleanupConfig.java
@@ -15,6 +15,7 @@
 package com.google.gerrit.server.config;
 
 import com.google.common.base.Strings;
+import com.google.gerrit.common.Nullable;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 
@@ -41,7 +42,7 @@
 
   @Inject
   ChangeCleanupConfig(@GerritServerConfig Config cfg,
-      @CanonicalWebUrl String canonicalWebUrl) {
+      @CanonicalWebUrl @Nullable String canonicalWebUrl) {
     scheduleConfig = new ScheduleConfig(cfg, SECTION);
     abandonAfter = readAbandonAfter(cfg);
     abandonIfMergeable =
@@ -61,7 +62,9 @@
     if (Strings.isNullOrEmpty(abandonMessage)) {
       abandonMessage = DEFAULT_ABANDON_MESSAGE;
     }
-    abandonMessage = abandonMessage.replaceAll("\\$\\{URL\\}", webUrl);
+    if (!Strings.isNullOrEmpty(webUrl)) {
+      abandonMessage = abandonMessage.replaceAll("\\$\\{URL\\}", webUrl);
+    }
     return abandonMessage;
   }