From fa810de8f03f7577b7b2d95cbee0ebf5c336a309 Mon Sep 17 00:00:00 2001
From: Anton Keks <anton@codeborne.com>
Date: Sat, 22 Jan 2022 15:14:39 +0200
Subject: [PATCH] do not merge UDP failed pings when falling back to TCP on Win
 & Mac to get the ping count right (as requested)

---
 src/net/azib/ipscan/core/net/CombinedUnprivilegedPinger.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/net/azib/ipscan/core/net/CombinedUnprivilegedPinger.java b/src/net/azib/ipscan/core/net/CombinedUnprivilegedPinger.java
index a1a495da..ff0df333 100644
--- a/src/net/azib/ipscan/core/net/CombinedUnprivilegedPinger.java
+++ b/src/net/azib/ipscan/core/net/CombinedUnprivilegedPinger.java
@@ -35,7 +35,6 @@ public class CombinedUnprivilegedPinger implements Pinger {
 			return udpResult.merge(udpPinger.ping(subject, count - udpCountInitialCount));
 
 		// fallback to TCP - it may detect some hosts UDP cannot
-		PingResult tcpResult = tcpPinger.ping(subject, count);
-		return tcpResult.merge(udpResult);
+		return tcpPinger.ping(subject, count);
 	}
 }