From c28c07868f44d7edc0404824ee05439bbf839141 Mon Sep 17 00:00:00 2001 From: Janne Valkealahti Date: Tue, 15 Dec 2015 08:42:52 +0000 Subject: [PATCH] Wrong publish method calls - notifyTransition and notifyTransitionEnd call wrong publish methods. fix by well calling correct methods. - Fixes #144 --- .../support/StateMachineObjectSupport.java | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/StateMachineObjectSupport.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/StateMachineObjectSupport.java index 48d7a183..27b80c51 100644 --- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/StateMachineObjectSupport.java +++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/StateMachineObjectSupport.java @@ -51,26 +51,26 @@ public abstract class StateMachineObjectSupport extends LifecycleObjectSup /** Flag for application context events */ private boolean contextEventsEnabled = true; - private final StateMachineInterceptorList interceptors = - new StateMachineInterceptorList(); - - private String beanName; + private final StateMachineInterceptorList interceptors = + new StateMachineInterceptorList(); - @Override - public void setBeanName(String name) { - beanName = name; - } - - /** - * Returns a bean name known to context per contract - * with {@link BeanNameAware}. - * - * @return a bean name - */ - protected String getBeanName() { + private String beanName; + + @Override + public void setBeanName(String name) { + beanName = name; + } + + /** + * Returns a bean name known to context per contract + * with {@link BeanNameAware}. + * + * @return a bean name + */ + protected String getBeanName() { return beanName; } - + /** * Gets the state machine event publisher. * @@ -166,7 +166,7 @@ public abstract class StateMachineObjectSupport extends LifecycleObjectSup if (contextEventsEnabled) { StateMachineEventPublisher eventPublisher = getStateMachineEventPublisher(); if (eventPublisher != null) { - eventPublisher.publishTransitionEnd(this, transition); + eventPublisher.publishTransition(this, transition); } } } @@ -176,7 +176,7 @@ public abstract class StateMachineObjectSupport extends LifecycleObjectSup if (contextEventsEnabled) { StateMachineEventPublisher eventPublisher = getStateMachineEventPublisher(); if (eventPublisher != null) { - eventPublisher.publishTransition(this, transition); + eventPublisher.publishTransitionEnd(this, transition); } } } @@ -237,7 +237,7 @@ public abstract class StateMachineObjectSupport extends LifecycleObjectSup protected void setStateMachineInterceptors(List> interceptors) { Collections.sort(interceptors, new OrderComparator()); - this.interceptors.set(interceptors); + this.interceptors.set(interceptors); } /**