Spring Simplify some control flow code

I found some control flow code can be simplify

Comment From: pivotal-issuemaster

@Deycoesr Please sign the Contributor License Agreement!

Click here to manually synchronize the status of this Pull Request.

See the FAQ for frequently asked questions.

Comment From: pivotal-issuemaster

@Deycoesr Thank you for signing the Contributor License Agreement!

Comment From: sbrannen

@Deycoesr, did you intentionally close this PR?

Comment From: Deycoesr

Not, I used git push origin HEAD --force.

Comment From: Deycoesr

I'm sorry, i don't know there will be such consequences. I created a new PR. #24925