diff options
author | Sven Selberg <sven.selberg@axis.com> | 2022-05-10 11:49:40 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-05-10 11:49:40 +0000 |
commit | 062c24418d7ff6e8c0057d647cb180840bf7185f (patch) | |
tree | 13011cd7762507b16d81e97e4dd1261b968ede02 | |
parent | a01b54d5c572abbd3f08ac2bf289bcb375c8adca (diff) | |
parent | 208487a3050354eeceefdaff0c675819e1fff058 (diff) |
Merge "Merge branch 'stable-3.4' into stable-3.5" into stable-3.5
3 files changed, 10 insertions, 1 deletions
diff --git a/java/com/google/gerrit/server/logging/LoggingContext.java b/java/com/google/gerrit/server/logging/LoggingContext.java index 3907da56a1..eac96a676e 100644 --- a/java/com/google/gerrit/server/logging/LoggingContext.java +++ b/java/com/google/gerrit/server/logging/LoggingContext.java @@ -90,8 +90,9 @@ public class LoggingContext extends com.google.common.flogger.backend.system.Log return tags.get() == null && forceLogging.get() == null && performanceLogging.get() == null + && (performanceLogRecords.get() == null || performanceLogRecords.get().isEmtpy()) && 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 baa9b1f245..a692d2b178 100644 --- a/java/com/google/gerrit/server/logging/MutableAclLogRecords.java +++ b/java/com/google/gerrit/server/logging/MutableAclLogRecords.java @@ -45,6 +45,10 @@ public class MutableAclLogRecords { return ImmutableList.copyOf(aclLogRecords); } + public boolean isEmpty() { + return aclLogRecords.isEmpty(); + } + @Override public String toString() { return MoreObjects.toStringHelper(this).add("aclLogRecords", aclLogRecords).toString(); diff --git a/java/com/google/gerrit/server/logging/MutablePerformanceLogRecords.java b/java/com/google/gerrit/server/logging/MutablePerformanceLogRecords.java index 4ee70d7c19..2965719f15 100644 --- a/java/com/google/gerrit/server/logging/MutablePerformanceLogRecords.java +++ b/java/com/google/gerrit/server/logging/MutablePerformanceLogRecords.java @@ -46,6 +46,10 @@ public class MutablePerformanceLogRecords { return ImmutableList.copyOf(performanceLogRecords); } + public boolean isEmtpy() { + return performanceLogRecords.isEmpty(); + } + @Override public String toString() { return MoreObjects.toStringHelper(this) |