commit eefe1b85c540be7e0634a3621466bd0e4f52527c
author David Ostrovsky <david@ostrovsky.org> Sat Jun 17 14:53:00 2017 +0200
committer David Ostrovsky <david.ostrovsky@gmail.com> Sat Jun 17 13:49:02 2017 +0000
tree 413a4775eb383378c1ceadad275db15119defcef
parent 3d9718652699c9c4315b6e202ffa84640280d0d6

Fix ref updated event on change deletion

If newRev attribute in RefUpdateAttribute is zero id, commit cannot
be retrieved and exception is recorded in the log. Detect this case
and avoid trying to read commit content for zero id.

Bug: Issue 6265
Change-Id: I28a4b15a8e9fc2998e6f92b4176e92799a6a944d

src/main/java/com/googlesource/gerrit/plugins/its/base/util/PropertyExtractor.java

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 e3d5686..d93a2a3 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
@@ -21,6 +21,7 @@
 import com.google.gerrit.server.data.ApprovalAttribute;
 import com.google.gerrit.server.data.ChangeAttribute;
 import com.google.gerrit.server.data.PatchSetAttribute;
+import com.google.gerrit.server.data.RefUpdateAttribute;
 import com.google.gerrit.server.events.ChangeAbandonedEvent;
 import com.google.gerrit.server.events.ChangeEvent;
 import com.google.gerrit.server.events.ChangeMergedEvent;
@@ -35,6 +36,9 @@
 
 import com.googlesource.gerrit.plugins.its.base.workflow.Property;
 
+import org.eclipse.jgit.lib.ObjectId;
+
+import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
 
@@ -120,8 +124,12 @@
     common.add(propertyFactory.create("event-type", event.type));
     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(),
-        event.refUpdate.get().newRev);
+        refUpdated.newRev);
   }
 
   private Map<String,Set<String>> extractFrom(PatchSetCreatedEvent event,