findbugs: fixing boxing-unboxing issues

Change-Id: Ibcec12523c2d09b15c2322e3b82ee47e27d03836
Signed-off-by: Shahar Havivi <shavivi@redhat.com>