| commit | 6aa4f462eae63c01179e6e276bc4a42731527e02 | [log] [tgz] |
|---|---|---|
| author | Remy Bohmer <linux@bohmer.net> | Mon Feb 26 09:09:27 2018 +0000 |
| committer | David Pursehouse <dpursehouse@collab.net> | Tue Feb 27 11:49:01 2018 +0900 |
| tree | 0d60f5d8ed6336f2ba856712fdbdbf49fa8a8088 | |
| parent | a251e1ed19164a515ae394985a6595b8f3ab5c6d [diff] |
StreamEventsApiListener: Prevent NPE when account is null This happens when account is null and some plugin wants to convert the account data to an account attribute from the event. This account is null, for example, if the change-abandoned event is generated on the auto cleanup inside Gerrit Core. Change-Id: Id4595208d3745988ec6c6008ea4506fd4e9ff7eb Signed-off-by: Remy Bohmer <linux@bohmer.net>
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/StreamEventsApiListener.java b/gerrit-server/src/main/java/com/google/gerrit/server/events/StreamEventsApiListener.java index 5294391..a5fe0a6 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/events/StreamEventsApiListener.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/events/StreamEventsApiListener.java
@@ -177,8 +177,8 @@ new Supplier<AccountAttribute>() { @Override public AccountAttribute get() { - return eventFactory.asAccountAttribute( - new Account.Id(account._accountId)); + return account != null ? eventFactory.asAccountAttribute( + new Account.Id(account._accountId)) : null; } }); }