| commit | 7dc58e2c32b3dd7c494eb910939ce4d5877ab496 | [log] [tgz] |
|---|---|---|
| author | Sven Selberg <svense@axis.com> | Fri Apr 29 13:12:16 2022 +0200 |
| committer | Sven Selberg <sven.selberg@axis.com> | Mon May 02 12:56:19 2022 +0000 |
| tree | 6dfa96ed6797fdee9b573477dc08feadfea6e6af | |
| parent | 5c808ff99ed8c701dad23cf4fbfc45217e05ee38 [diff] |
LoggingContext: Consider empty aclLogRecords as emtpy Bug: Issue 15889 Release-Notes: Fix "Logging context is not empty" log spam. Change-Id: Id34aa123a771466196049635c5ee13c9def19063
diff --git a/java/com/google/gerrit/server/logging/LoggingContext.java b/java/com/google/gerrit/server/logging/LoggingContext.java index 5611d08..740058c 100644 --- a/java/com/google/gerrit/server/logging/LoggingContext.java +++ b/java/com/google/gerrit/server/logging/LoggingContext.java
@@ -91,7 +91,7 @@ && forceLogging.get() == null && performanceLogging.get() == null && aclLogging.get() == null - && aclLogRecords.get() == null; + && (aclLogRecords.get() == null || aclLogRecords.get().isEmpty()); } public void clear() {
diff --git a/java/com/google/gerrit/server/logging/MutableAclLogRecords.java b/java/com/google/gerrit/server/logging/MutableAclLogRecords.java index baa9b1f..a692d2b 100644 --- a/java/com/google/gerrit/server/logging/MutableAclLogRecords.java +++ b/java/com/google/gerrit/server/logging/MutableAclLogRecords.java
@@ -45,6 +45,10 @@ return ImmutableList.copyOf(aclLogRecords); } + public boolean isEmpty() { + return aclLogRecords.isEmpty(); + } + @Override public String toString() { return MoreObjects.toStringHelper(this).add("aclLogRecords", aclLogRecords).toString();