Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
Do not fetch commit message for ref deletions
Revert "Fix ref updated event on change deletion"
Change-Id: I083eac325d7155f5677a5c43a3eacb2e537b49dd
diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/base/util/PropertyExtractor.java b/src/main/java/com/googlesource/gerrit/plugins/its/base/util/PropertyExtractor.java
index b04bcb0..f24eec4 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/its/base/util/PropertyExtractor.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/base/util/PropertyExtractor.java
@@ -33,7 +33,6 @@
import com.google.gerrit.server.events.RefUpdatedEvent;
import com.google.inject.Inject;
import com.googlesource.gerrit.plugins.its.base.workflow.Property;
-import java.util.Collections;
import java.util.Map;
import java.util.Set;
import org.eclipse.jgit.lib.ObjectId;
@@ -107,11 +106,12 @@
common.addAll(propertyAttributeExtractor.extractFrom(event.submitter.get(), "submitter"));
}
common.addAll(propertyAttributeExtractor.extractFrom(event.refUpdate.get()));
- RefUpdateAttribute refUpdated = event.refUpdate.get();
- if (ObjectId.zeroId().name().equals(refUpdated.newRev)) {
- return Collections.emptyMap();
- }
- return issueExtractor.getIssueIds(event.getProjectNameKey().get(), refUpdated.newRev);
+ RefUpdateAttribute refUpdateEvent = event.refUpdate.get();
+ String commitId =
+ (refUpdateEvent.newRev.equals(ObjectId.zeroId().name())
+ ? refUpdateEvent.oldRev
+ : refUpdateEvent.newRev);
+ return issueExtractor.getIssueIds(event.getProjectNameKey().get(), commitId);
}
private Map<String, Set<String>> extractFrom(PatchSetCreatedEvent event, Set<Property> common) {
