am 1746d6fe: Fix a bug that findbugs found

Merge commit '1746d6fefcb1b4869f475a81f5aec35db4695603'

* commit '1746d6fefcb1b4869f475a81f5aec35db4695603':
  Fix a bug that findbugs found