Merge "Buck: Adjust to upstream change: "default java targeted to be Java 7""
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Topic.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Topic.java
index e9f07c1..512203a 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Topic.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Topic.java
@@ -18,7 +18,6 @@
import com.google.gerrit.client.changes.ChangeApi;
import com.google.gerrit.client.changes.ChangeInfo;
import com.google.gerrit.client.rpc.GerritCallback;
-import com.google.gerrit.client.ui.BranchLink;
import com.google.gerrit.client.ui.InlineHyperlink;
import com.google.gerrit.common.PageLinks;
import com.google.gerrit.reviewdb.client.PatchSet;
@@ -84,14 +83,12 @@
}
private void initTopicLink(ChangeInfo info) {
- text.setText(info.topic());
- text.setTargetHistoryToken(
- PageLinks.toChangeQuery(
- BranchLink.query(
- info.project_name_key(),
- info.status(),
- info.branch(),
- info.topic())));
+ if (info.topic() != null && !info.topic().isEmpty()) {
+ text.setText(info.topic());
+ text.setTargetHistoryToken(
+ PageLinks.toChangeQuery(
+ PageLinks.op("topic", info.topic())));
+ }
}
boolean canEdit() {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReviewers.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReviewers.java
index 6fd9002..7f6fc97 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReviewers.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReviewers.java
@@ -273,7 +273,7 @@
toMail.add(psa.getAccountId());
}
}
- if (!added.isEmpty()) {
+ if (!toMail.isEmpty()) {
try {
AddReviewerSender cm = addReviewerSenderFactory.create(change);
cm.setFrom(currentUser.getAccountId());
