Shahar Havivi has uploaded a new change for review. Change subject: findbugs: Comparing integer by its reference value ......................................................................
findbugs: Comparing integer by its reference value Change-Id: If780c1f44b1750dba343831e58f866359eded941 Signed-off-by: Shahar Havivi <[email protected]> --- M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCapabilityResourceTest.java 2 files changed, 10 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/70/14570/1 diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResourceTest.java index 1ecea45..7fe65b3 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResourceTest.java @@ -360,7 +360,11 @@ } private boolean greaterOrEqual(Version a, Version b) { - return a.getMajor() != b.getMajor() ? a.getMajor() >= b.getMajor() : a.getMinor() >= b.getMinor(); + int aMajor = a.getMajor() == null ? 0 : a.getMajor().intValue(); + int aMinor = a.getMinor() == null ? 0 : a.getMinor().intValue(); + int bMajor = b.getMajor() == null ? 0 : b.getMajor().intValue(); + int bMinor = b.getMinor() == null ? 0 : b.getMinor().intValue(); + return aMajor != bMajor ? aMajor >= bMajor : aMinor >= bMinor; } @Override diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCapabilityResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCapabilityResourceTest.java index 2c12e7a..b56c24f 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCapabilityResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCapabilityResourceTest.java @@ -363,7 +363,11 @@ } private boolean greaterOrEqual(Version a, Version b) { - return a.getMajor() != b.getMajor() ? a.getMajor() >= b.getMajor() : a.getMinor() >= b.getMinor(); + int aMajor = a.getMajor() == null ? 0 : a.getMajor().intValue(); + int aMinor = a.getMinor() == null ? 0 : a.getMinor().intValue(); + int bMajor = b.getMajor() == null ? 0 : b.getMajor().intValue(); + int bMinor = b.getMinor() == null ? 0 : b.getMinor().intValue(); + return aMajor != bMajor ? aMajor >= bMajor : aMinor >= bMinor; } @Override -- To view, visit http://gerrit.ovirt.org/14570 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If780c1f44b1750dba343831e58f866359eded941 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shahar Havivi <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
