Merge pull request #7250 from minggo/fix-compiling

fix compiling error
call parent onExit method
Merge pull request #7258 from andyque/fixSchedulerTest

call parent onExit method