From 9687f28eb007a5b66062c46bc4e6658551de192b Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Mon, 13 Mar 2017 18:08:36 +0100 Subject: [PATCH] bugfixes --- src/se/hal/plugin/netscan/NetScanController.java | 4 ++-- src/se/hal/struct/TriggerFlow.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/se/hal/plugin/netscan/NetScanController.java b/src/se/hal/plugin/netscan/NetScanController.java index 222d0240..36fe3e5e 100755 --- a/src/se/hal/plugin/netscan/NetScanController.java +++ b/src/se/hal/plugin/netscan/NetScanController.java @@ -74,8 +74,8 @@ public class NetScanController implements HalEventController, HalAutoScannableCo //logger.finest("Pinging IP "+ device.getHost()); boolean online = InetScanner.isReachable(device.getHost(), executor); if (data == null || data.isOn() != online) { - entry.setValue( - new SwitchEventData(online, System.currentTimeMillis())); + data = new SwitchEventData(online, System.currentTimeMillis()); + entry.setValue(data); logger.fine("IP "+device.getHost() +" state has changed to "+ data); listener.reportReceived(device, data); } diff --git a/src/se/hal/struct/TriggerFlow.java b/src/se/hal/struct/TriggerFlow.java index 57bf6495..9ae54433 100755 --- a/src/se/hal/struct/TriggerFlow.java +++ b/src/se/hal/struct/TriggerFlow.java @@ -63,10 +63,10 @@ public class TriggerFlow extends DBBean { */ public boolean evaluate(){ for(Trigger trigger : triggerList){ - if (trigger.evaluate()) - return true; + if (!trigger.evaluate()) + return false; } - return false; + return true; } /**