From Andrei:

Fix a slowdown(infinite loop in some cases) due to a boundary crossing problem.


git-svn-id: http://root.cern.ch/svn/root/trunk@17781 27541ba8-7e3a-0410-8455-c3a389f83636