Commite652435

committed

issue: 修复isMatch方法终态判断的问题

1 parent3a8d5f8 commite652435Copy full SHA for e652435

File tree

-5

lines changed

squirrel-foundation/src
- main/java/org/squirrelframework/foundation/fsm/impl
  - TransitionImpl.java
- test/java/org/squirrelframework/foundation/fsm/issue
  - NormalStateMachineInit.java

-5

lines changed

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -220,10 +220,9 @@ public void accept(Visitor visitor) {`
`220`	`220`
`221`	`221`	`@Override`
`222`	`222`	`publicbooleanisMatch(SfromState,StoState,Eevent,intpriority) {`
`223`		`-if(toState==null && !getTargetState().isFinalState())`
	`223`	`+if(toState==null)`
`224`	`224`	`returnfalse;`
`225`		`-if(toState!=null && !getTargetState().isFinalState() &&`
`226`		`- !getTargetState().getStateId().equals(toState))`
	`225`	`+if(toState!=null && !getTargetState().getStateId().equals(toState))`
`227`	`226`	`returnfalse;`
`228`	`227`	`if(!getEvent().equals(event))`
`229`	`228`	`returnfalse;`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,16 +5,19 @@`
`5`	`5`
`6`	`6`	`importjava.util.*;`
`7`	`7`
	`8`	`+importstaticorg.junit.Assert.assertNotNull;`
	`9`	`+`
`8`	`10`
`9`	`11`	`publicclassNormalStateMachineInit {`
`10`	`12`
`11`	`13`
`12`	`14`	`/**`
`13`		`- * 定义终态、相同的event下、使用了mvel表达式且没有命名，在checkConflictTransitions方法中会认为使用了相同的Transition，抛异常`
	`15`	`+ * 问题：定义终态、相同的event下、使用了mvel表达式且没有命名，在checkConflictTransitions方法中会认为使用了相同的Transition，抛异常。`
	`16`	`+ * 修复：isMatch方法去掉终态的判断`
`14`	`17`	`* @see org.squirrelframework.foundation.fsm.impl.StateImpl#checkConflictTransitions`
`15`	`18`	`* @see org.squirrelframework.foundation.fsm.impl.TransitionImpl#isMatch(S, S, E, int)`
`16`	`19`	`*/`
`17`		`-@Test(expected =Exception.class)`
	`20`	`+@Test`
`18`	`21`	`publicvoidinitSignUpStateMachine() {`
`19`	`22`
`20`	`23`	`StateMachineBuilder<SignupStateMachine,SignUpStatusEnum,BusinessEventEnum,Map>builder =`
`@@ -47,6 +50,7 @@ public void initSignUpStateMachine() {`
`47`	`50`
`48`	`51`	`// 初始化状态机对象`
`49`	`52`	`SignupStateMachinesignupStateMachine =builder.newStateMachine(SignUpStatusEnum.START);`
	`53`	`+assertNotNull(signupStateMachine);`
`50`	`54`	`}`
`51`	`55`
`52`	`56`	`}`

Comments

(0)