From 33a9c59f3918335eb6d94d9a009012e43812a743 Mon Sep 17 00:00:00 2001 From: Janne Valkealahti Date: Wed, 22 Mar 2017 15:52:10 +0000 Subject: [PATCH] Prevent debug calls - Polish to do checks for debug/trace logs - Fixes #329 --- .../support/AbstractStateMachine.java | 16 ++++++++++++---- .../support/DefaultStateMachineExecutor.java | 4 +++- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/AbstractStateMachine.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/AbstractStateMachine.java index c774a38a..bbb59208 100644 --- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/AbstractStateMachine.java +++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/AbstractStateMachine.java @@ -1075,7 +1075,9 @@ public abstract class AbstractStateMachine extends StateMachineObjectSuppo if (state == null) { return; } - log.trace("Trying Exit state=[" + state + "]"); + if (log.isTraceEnabled()) { + log.trace("Trying Exit state=[" + state + "]"); + } StateContext stateContext = buildStateContext(Stage.STATE_EXIT, message, transition, stateMachine); if (transition != null) { @@ -1111,7 +1113,9 @@ public abstract class AbstractStateMachine extends StateMachineObjectSuppo } - log.debug("Exit state=[" + state + "]"); + if (log.isDebugEnabled()) { + log.debug("Exit state=[" + state + "]"); + } state.exit(stateContext); notifyStateExited(buildStateContext(Stage.STATE_EXIT, message, null, getRelayStateMachine(), state, null)); @@ -1138,7 +1142,9 @@ public abstract class AbstractStateMachine extends StateMachineObjectSuppo if (state == null) { return; } - log.trace("Trying Enter state=[" + state + "]"); + if (log.isTraceEnabled()) { + log.trace("Trying Enter state=[" + state + "]"); + } StateContext stateContext = buildStateContext(Stage.STATE_ENTRY, message, transition, stateMachine, sources, targets); if (transition != null) { @@ -1180,7 +1186,9 @@ public abstract class AbstractStateMachine extends StateMachineObjectSuppo if (!StateMachineUtils.isPseudoState(state, PseudoStateKind.JOIN)) { notifyStateEntered(buildStateContext(Stage.STATE_ENTRY, message, transition, getRelayStateMachine(), null, state)); } - log.debug("Enter state=[" + state + "]"); + if (log.isDebugEnabled()) { + log.debug("Enter state=[" + state + "]"); + } state.entry(stateContext); } diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/DefaultStateMachineExecutor.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/DefaultStateMachineExecutor.java index a3ab27f3..27f64d66 100644 --- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/DefaultStateMachineExecutor.java +++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/DefaultStateMachineExecutor.java @@ -128,7 +128,9 @@ public class DefaultStateMachineExecutor extends LifecycleObjectSupport im @Override public void queueTrigger(Trigger trigger, Message message) { - log.debug("Queue trigger " + trigger); + if (log.isDebugEnabled()) { + log.debug("Queue trigger " + trigger); + } triggerQueue.add(new TriggerQueueItem(trigger, message)); }