opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.16'

Browse Source 
* stable-2.16:
  GroupsUpdate: Add trace timer on group creation/update operations
  GroupsUpdate: Add debug log on cache eviction for group creation/update
  GroupsUpdate: Rename update... methods to evict...
  VersionedMetaData: Convert debug log of read/save file to trace timers
  TraceContext: Support fourth format parameter
  TestAccount: Add implementation of toString
  Correct URL of change message requests in docs
  Fixing Linux Kernel URL in Why Code Review Doc
  ExternalIdNotes: Only log 'reading external ID note map' when actually doing so
  RestApiException: Fix Javadoc
  Fix groups to prevent javascript errors with url

Change-Id: Ie5c73b3424c62b9e664ec16b7699ae4194a194cc
This commit is contained in:
David Pursehouse
2019-03-27 11:27:51 +01:00
parent 8a2b4f3cba dc9e7bfc5a
commit 0a16d95222
8 changed files with 99 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
java/com/google/gerrit/server/account/externalids/ExternalIdNotes.java
View File

@@ -656,9 +656,12 @@ public class ExternalIdNotes extends VersionedMetaData {
@Override
protected void onLoad() throws IOException, ConfigInvalidException {
logger.atFine().log("Reading external ID note map");
noteMap = revision != null ? NoteMap.read(reader, revision) : NoteMap.newEmptyMap();
if (revision != null) {
logger.atFine().log("Reading external ID note map");
noteMap = NoteMap.read(reader, revision);
} else {
noteMap = NoteMap.newEmptyMap();
}
if (afterReadRevision != null) {
afterReadRevision.run();