Fix sonar issues

Either log or rethrow this exception
Change this "try" to a try-with-resources
Move string literal on the left side of this string comparison

Issue-ID: PORTAL-562
Change-Id: I8966c035bb8c36026172457231f426179bb3ed48
Signed-off-by: Parshad Patel <pars.patel@samsung.com>
3 files changed