ATLAS-1663: Fix defects reported by Coverity Scan

Signed-off-by: Madhan Neethiraj <madhan@apache.org>
2 files changed