[Java] Remove return from inside loop on buffer cleaning.
Merge remote-tracking branch 'origin/master'