| commit | b00f11daf479e5685ae074f092ce2b79a7ad404d | [log] [tgz] |
|---|---|---|
| author | Sven Selberg <svense@axis.com> | Fri Apr 29 14:24:34 2022 +0200 |
| committer | Sven Selberg <sven.selberg@axis.com> | Mon May 02 12:59:01 2022 +0000 |
| tree | bbca2f1ab07d6f537a069bc659562b5697c4fb4d | |
| parent | 7dc58e2c32b3dd7c494eb910939ce4d5877ab496 [diff] |
Consider non-empty performance log-records as non-empty The improper check for whether performanceLogRecords was null or not was removed in [1] but wasn't replaced with a check whether the performanceLogRecords was actually empty or not. [1] https://gerrit-review.googlesource.com/c/gerrit/+/295125 Release-Notes: skip Change-Id: I70ff8046226914ed53196d3f2b8b9b6468a6d25e
diff --git a/java/com/google/gerrit/server/logging/LoggingContext.java b/java/com/google/gerrit/server/logging/LoggingContext.java index 740058c..35594e9 100644 --- a/java/com/google/gerrit/server/logging/LoggingContext.java +++ b/java/com/google/gerrit/server/logging/LoggingContext.java
@@ -90,6 +90,7 @@ return tags.get() == null && forceLogging.get() == null && performanceLogging.get() == null + && (performanceLogRecords.get() == null || performanceLogRecords.get().isEmtpy()) && aclLogging.get() == null && (aclLogRecords.get() == null || aclLogRecords.get().isEmpty()); }
diff --git a/java/com/google/gerrit/server/logging/MutablePerformanceLogRecords.java b/java/com/google/gerrit/server/logging/MutablePerformanceLogRecords.java index 4ee70d7..2965719 100644 --- a/java/com/google/gerrit/server/logging/MutablePerformanceLogRecords.java +++ b/java/com/google/gerrit/server/logging/MutablePerformanceLogRecords.java
@@ -46,6 +46,10 @@ return ImmutableList.copyOf(performanceLogRecords); } + public boolean isEmtpy() { + return performanceLogRecords.isEmpty(); + } + @Override public String toString() { return MoreObjects.toStringHelper(this)