Shahar Havivi has uploaded a new change for review. Change subject: findbugs: Loaded null value of local variables ......................................................................
findbugs: Loaded null value of local variables findbugs reason: NP: Load of known null value (NP_LOAD_OF_KNOWN_NULL_VALUE) Change-Id: Ic0e90d1783caac1e9e769550c15f46c868d45bb2 Signed-off-by: Shahar Havivi <[email protected]> --- M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/LocaleUtils.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ObjectIdentityChecker.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmReader.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/basic/VmTypeImage.java 5 files changed, 10 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/21/15321/1 diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/LocaleUtils.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/LocaleUtils.java index a02ff45..0c84b3f 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/LocaleUtils.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/LocaleUtils.java @@ -29,8 +29,12 @@ public static Locale getLocaleFromString(String localeString, boolean returnDefaultLocale) { Locale result = returnDefaultLocale ? null : Locale.US; try { - result = org.apache.commons.lang.LocaleUtils.toLocale(localeString != null ? - localeString.replaceAll("\\-", "_") : localeString); + if (localeString != null) { + result = org.apache.commons.lang.LocaleUtils.toLocale(localeString.replaceAll("\\-", "_")); + } + else { + result = null; + } if(result == null && returnDefaultLocale) { result = Locale.US; } diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ObjectIdentityChecker.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ObjectIdentityChecker.java index 025cd53..8a6178a 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ObjectIdentityChecker.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ObjectIdentityChecker.java @@ -56,7 +56,7 @@ if (type != null) { return CanUpdateField(type, fieldName, status, fieldContainer); } else { - throw new RuntimeException(String.format("status type %1$s not exist", type)); + throw new RuntimeException("status type [null] not exist"); } } diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmReader.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmReader.java index 670cc44..4a2f334 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmReader.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmReader.java @@ -91,7 +91,7 @@ } final Date creationDate = OvfParser.UtcDateStringToLocaDate( node.SelectSingleNode("rasd:CreationDate", _xmlNS).InnerText); - if (creationDate == null) { + if (creationDate != null) { image.setCreationDate(creationDate); } final Date lastModified = OvfParser.UtcDateStringToLocaDate( diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java index 0d147cb..c2ff9e6 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java @@ -848,7 +848,7 @@ for (Object app : apps) { String appString = (String) ((app instanceof String) ? app : null); if (app == null) { - log.warnFormat("Failed to convert app: {0} to string", app); + log.warn("Failed to convert app: [null] to string"); } if (!firstTime) { builder.append(","); diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/basic/VmTypeImage.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/basic/VmTypeImage.java index 3d2e82d..5f43c14 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/basic/VmTypeImage.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/basic/VmTypeImage.java @@ -19,7 +19,7 @@ @Override protected String imageName(UserPortalItemModel value) { if (value == null) { - return defaultImageName(value); + return defaultImageName(null); } if (value.isPool()) { return "poolVmIcon"; //$NON-NLS-1$ -- To view, visit http://gerrit.ovirt.org/15321 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic0e90d1783caac1e9e769550c15f46c868d45bb2 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
