From 27fe54299b7da220dd1e8fd00fd43e0a9d8688db Mon Sep 17 00:00:00 2001 From: Oliver Olschina Date: Fri, 27 Oct 2023 10:00:27 +0200 Subject: [PATCH 1/2] Modifies the log message and fixes a NullPointer. Fixes: SIRI-893 --- src/main/java/sirius/kernel/xml/Outcall.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/sirius/kernel/xml/Outcall.java b/src/main/java/sirius/kernel/xml/Outcall.java index c0ee0c2a..48d53952 100644 --- a/src/main/java/sirius/kernel/xml/Outcall.java +++ b/src/main/java/sirius/kernel/xml/Outcall.java @@ -507,8 +507,7 @@ private void checkTimeoutBlacklist() throws IOException { if (timeout != null) { if (timeout > System.currentTimeMillis()) { throw new IOException(Strings.apply( - "Connecting to host %s with blacklistid %s is currently rejected due to connectivity issues.", - request.uri().getHost(), + "Connections with blacklistid %s are currently rejected due to connectivity issues.", blacklistId)); } else { timeoutBlacklist.remove(blacklistId); From 4fcc2ff41c8e319c6b29b9f21669bfe46438fbf8 Mon Sep 17 00:00:00 2001 From: Oliver Olschina Date: Fri, 27 Oct 2023 10:19:55 +0200 Subject: [PATCH 2/2] Modify the message. Fixes: SIRI-893 --- src/main/java/sirius/kernel/xml/Outcall.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/sirius/kernel/xml/Outcall.java b/src/main/java/sirius/kernel/xml/Outcall.java index 48d53952..f1405a0a 100644 --- a/src/main/java/sirius/kernel/xml/Outcall.java +++ b/src/main/java/sirius/kernel/xml/Outcall.java @@ -507,7 +507,7 @@ private void checkTimeoutBlacklist() throws IOException { if (timeout != null) { if (timeout > System.currentTimeMillis()) { throw new IOException(Strings.apply( - "Connections with blacklistid %s are currently rejected due to connectivity issues.", + "Connections with blacklist identifier %s are currently rejected due to connectivity issues.", blacklistId)); } else { timeoutBlacklist.remove(blacklistId);