From 9843ce5de37b1589b8ce56e4a696cac815ce024c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20K=C3=BCthe?= Date: Fri, 31 Oct 2025 21:27:56 +0000 Subject: [PATCH] Allow access to PingResult::merge outside the package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes https://github.com/angryip/ipscan/issues/489 Signed-off-by: Marek Küthe --- CHANGELOG | 1 + src/net/azib/ipscan/core/net/PingResult.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index ec3a63cba..81f61b8f9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Changes in 3.9.3: - Updated SWT for all platforms, improved loading of correct SWT library on Linux - Add support for plugin jars containing their own messages.properties +- Allow plugin to merge multiple ping results Changes in 3.9.2: - Linux: specify Java 17 as minimum required version in .deb and .rpm packages diff --git a/src/net/azib/ipscan/core/net/PingResult.java b/src/net/azib/ipscan/core/net/PingResult.java index 55c62a6ff..051975344 100644 --- a/src/net/azib/ipscan/core/net/PingResult.java +++ b/src/net/azib/ipscan/core/net/PingResult.java @@ -87,7 +87,7 @@ public boolean isTimeoutAdaptationAllowed() { return timeoutAdaptationAllowed; } - PingResult merge(PingResult result) { + public PingResult merge(PingResult result) { this.packetCount += result.packetCount; this.replyCount += result.replyCount; return this;