diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2022-01-19 09:53:21 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2022-01-19 09:53:21 +0100 |
| commit | 5f556588a9e4bb5ad23ca67fcf2543affaa0805a (patch) | |
| tree | 3da57e6caa2844005ccc194eeaa73dc35e41e799 /org.eclipse.jgit.junit.http | |
| parent | d017a655dfbdac2393ec645c6864e190cf55516c (diff) | |
| parent | 9b28f43cf16dc457415a051215b1dbc96cfd4c14 (diff) | |
| download | jgit-5f556588a9e4bb5ad23ca67fcf2543affaa0805a.tar.gz jgit-5f556588a9e4bb5ad23ca67fcf2543affaa0805a.zip | |
Merge branch 'stable-6.0'
* stable-6.0:
[bazel] Skip ConfigTest#testCommitTemplatePathInHomeDirecory
[errorprone] Fix InfiniteRecursion error in RecordingLogger
[errorprone] Suppress Finally error in ObjectDownloadListener
[errorprone] Fix implicit use of default charset in FileBasedConfigTest
[errorprone] Suppress FutureReturnValueIgnored in FileRepository#autoGc
Change-Id: I08d58c8f3f04e3a920da43b5fb252b1654c2b33c
Diffstat (limited to 'org.eclipse.jgit.junit.http')
| -rw-r--r-- | org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/RecordingLogger.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/RecordingLogger.java b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/RecordingLogger.java index 9c3c980ad8..af63084e93 100644 --- a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/RecordingLogger.java +++ b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/RecordingLogger.java @@ -180,11 +180,15 @@ public class RecordingLogger extends MarkerIgnoringBase { @Override public void warn(String format, Object arg) { - warn(format, Collections.singleton(arg)); + addWarnings(format, Collections.singleton(arg)); } @Override public void warn(String format, Object... arguments) { + addWarnings(format, arguments); + } + + private void addWarnings(String format, Object... arguments) { synchronized (warnings) { int i = 0; int index = format.indexOf("{}"); |