Alexander Wels has uploaded a new change for review. Change subject: userportal,webadmin: fix WelcomePage unit test ......................................................................
userportal,webadmin: fix WelcomePage unit test - Fixed unit test failing in certain environments. Change-Id: Iac045b3250004dd7c69981542c5549399161a81c Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=838456 Signed-off-by: Alexander Wels <[email protected]> --- M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/branding/BrandingManager.java 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/19/17419/1 diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/branding/BrandingManager.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/branding/BrandingManager.java index 126f14b..e125cd3 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/branding/BrandingManager.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/branding/BrandingManager.java @@ -141,7 +141,7 @@ } } } - return themes; + return themes != null ? themes : new ArrayList<BrandingTheme>(); } /** -- To view, visit http://gerrit.ovirt.org/17419 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iac045b3250004dd7c69981542c5549399161a81c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alexander Wels <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
