Tal Nisan has uploaded a new change for review. Change subject: findbugs: Fix redundant null checks warnings in uicommonweb project ......................................................................
findbugs: Fix redundant null checks warnings in uicommonweb project Change-Id: I0acb590a9cb5416626d65526442fa4e36d2c7cd5 Signed-off-by: Tal Nisan <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java 2 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/78/14478/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java index 754450c..2bdd4a7 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java @@ -29,6 +29,7 @@ import org.ovirt.engine.core.common.businessentities.Snapshot; import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.StorageDomainType; +import org.ovirt.engine.core.common.businessentities.StoragePool; import org.ovirt.engine.core.common.businessentities.StorageServerConnections; import org.ovirt.engine.core.common.businessentities.StorageType; import org.ovirt.engine.core.common.businessentities.TagsType; @@ -44,7 +45,6 @@ import org.ovirt.engine.core.common.businessentities.VolumeFormat; import org.ovirt.engine.core.common.businessentities.VolumeType; import org.ovirt.engine.core.common.businessentities.permissions; -import org.ovirt.engine.core.common.businessentities.StoragePool; import org.ovirt.engine.core.common.businessentities.tags; import org.ovirt.engine.core.common.businessentities.gluster.GlusterHookEntity; import org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeEntity; @@ -1108,7 +1108,7 @@ }; // Passing empty values for Volume and Brick to get the services of all the volumes/hosts in the cluster GlusterVolumeAdvancedDetailsParameters parameters = - new GlusterVolumeAdvancedDetailsParameters(clusterId, null, null, false); //$NON-NLS-1$ //$NON-NLS-2$ + new GlusterVolumeAdvancedDetailsParameters(clusterId, null, null, false); Frontend.RunQuery(VdcQueryType.GetGlusterVolumeAdvancedDetails, parameters, aQuery); @@ -2126,8 +2126,8 @@ Version clusterCompatibility = commandVersionsInfo.getClusterVersion(); Version dcCompatibility = commandVersionsInfo.getStoragePoolVersion(); - return (cluster != null && clusterCompatibility.compareTo(cluster) <= 0) - && (dc != null && dcCompatibility.compareTo(dc) <= 0); + return (clusterCompatibility.compareTo(cluster) <= 0) + && dcCompatibility.compareTo(dc) <= 0; } public static CommandVersionsInfo GetCommandVersionsInfo(VdcActionType vdcActionType) { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java index 7913d6e..49a1afb 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java @@ -1151,7 +1151,7 @@ getTestCommand().setIsExecutionAllowed(true); } else { - if (response != null && response.getReturnValue() != null) { + if (response.getReturnValue() != null) { FenceStatusReturnValue fenceStatusReturnValue = (FenceStatusReturnValue) response.getReturnValue(); String message = fenceStatusReturnValue.toString(); -- To view, visit http://gerrit.ovirt.org/14478 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0acb590a9cb5416626d65526442fa4e36d2c7cd5 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tal Nisan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
