Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
PropertyExtractor: Add null check for event.submitter
Change-Id: I22077c68cd9fce86899c7d9dac5b160c5380fe52
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 3442cbf..b04bcb0 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
@@ -103,7 +103,9 @@
private Map<String, Set<String>> extractFrom(RefUpdatedEvent event, Set<Property> common) {
common.add(propertyFactory.create("event-type", event.type));
- common.addAll(propertyAttributeExtractor.extractFrom(event.submitter.get(), "submitter"));
+ if (event.submitter != null) {
+ 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)) {
