Don't include the footer "--" line in emails if the footer is empty

We should only include the "--\n" line in an email sent from Gerrit
if there will be content below that line.  Otherwise its just noise
and looks out of place in the message.

Usually there is content below the line, as the canonical_url is set
and thus we can make backlinks to ourselves.  But this isn't always
the case, so we should format a bit better when it isn't.

Signed-off-by: Shawn O. Pearce <sop@google.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/appjar/src/main/java/com/google/gerrit/server/ChangeMail.java b/appjar/src/main/java/com/google/gerrit/server/ChangeMail.java
index b6674e3e2f..fbf966e63b 100644
--- a/appjar/src/main/java/com/google/gerrit/server/ChangeMail.java
+++ b/appjar/src/main/java/com/google/gerrit/server/ChangeMail.java
@@ -180,8 +180,8 @@ public class ChangeMail {
   }
 
   private void newChangeFooter() {
-    openFooter();
     if (changeUrl() != null) {
+      openFooter();
       body.append("View this change at ");
       body.append(changeUrl());
       body.append("\n");
@@ -251,8 +251,8 @@ public class ChangeMail {
         return;
       }
 
-      openFooter();
       if (changeUrl() != null) {
+        openFooter();
         body.append("To respond visit ");
         body.append(changeUrl());
         body.append("\n");