[ros-diffs] [cgutman] 41633: - Use the timeout that the caller gives us if it is nonzero so we don't block forever if nobody wakes us