Treat a null state as a failed state.

[rhynodge.git] / src / main / java / net / pterodactylus / reactor / engine / Engine.java

diff --git a/src/main/java/net/pterodactylus/reactor/engine/Engine.java b/src/main/java/net/pterodactylus/reactor/engine/Engine.java
index 41aedb7..949ce12 100644 (file)
--- a/src/main/java/net/pterodactylus/reactor/engine/Engine.java
+++ b/src/main/java/net/pterodactylus/reactor/engine/Engine.java
@@ -27,6 +27,7 @@ import net.pterodactylus.reactor.Query;
 import net.pterodactylus.reactor.Reaction;
 import net.pterodactylus.reactor.Trigger;
 import net.pterodactylus.reactor.states.AbstractState;
+import net.pterodactylus.reactor.states.FailedState;
 
 import org.apache.log4j.Logger;
 
@@ -122,6 +123,9 @@ public class Engine extends AbstractExecutionThreadService {
                        try {
                                logger.debug("Querying system...");
                                state = query.state();
+                               if (state == null) {
+                                       state = FailedState.INSTANCE;
+                               }
                                logger.debug("System queried.");
                        } catch (Throwable t1) {
                                logger.warn("Querying system failed!", t1);
@@ -140,9 +144,9 @@ public class Engine extends AbstractExecutionThreadService {
                        reactionExecution.addState(state);
 
                        /* only run trigger if we have collected two states. */
+                       Trigger trigger = nextReaction.trigger();
                        boolean triggerHit = false;
                        if (reactionExecution.previousState() != null) {
-                               Trigger trigger = nextReaction.trigger();
                                logger.debug("Checking Trigger for changes...");
                                triggerHit = trigger.triggers(reactionExecution.currentState(), reactionExecution.previousState());
                        }
@@ -151,8 +155,9 @@ public class Engine extends AbstractExecutionThreadService {
                        logger.debug(String.format("Trigger was hit: %s.", triggerHit));
                        if (triggerHit) {
                                logger.info("Executing Action...");
-                               nextReaction.action().execute(reactionExecution.currentState(), reactionExecution.previousState());
+                               nextReaction.action().execute(trigger.trigger());
                        }
+
                }
        }