From 06d440489e30b607f76e0dd920a0d6b76aac558f Mon Sep 17 00:00:00 2001 From: Anton Keks Date: Sat, 9 Mar 2013 17:35:36 +0200 Subject: [PATCH] default to WindowsPinger even on win64 --- src/net/azib/ipscan/core/net/PingerRegistry.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/net/azib/ipscan/core/net/PingerRegistry.java b/src/net/azib/ipscan/core/net/PingerRegistry.java index 8cacab48..5d9cf76e 100755 --- a/src/net/azib/ipscan/core/net/PingerRegistry.java +++ b/src/net/azib/ipscan/core/net/PingerRegistry.java @@ -37,10 +37,8 @@ public class PingerRegistry { this.scannerConfig = scannerConfig; pingers = new LinkedHashMap>(); - if (Platform.WINDOWS) { - // this will be the preferred choice for Windows users + if (Platform.WINDOWS) pingers.put("pinger.windows", WindowsPinger.class); - } pingers.put("pinger.icmp", ICMPSharedPinger.class); pingers.put("pinger.icmp2", ICMPPinger.class); pingers.put("pinger.udp", UDPPinger.class); @@ -90,7 +88,7 @@ public class PingerRegistry { catch (Throwable e) { LOG.info("ICMP pinger failed: " + e); // win32 will use native pinger, all others get combined UDP+TCP, which doesn't require special privileges - scannerConfig.selectedPinger = Platform.WINDOWS && !Platform.ARCH_64 ? "pinger.windows" : "pinger.combined"; + scannerConfig.selectedPinger = Platform.WINDOWS ? "pinger.windows" : "pinger.combined"; return false; } }