[Engine-patches] Change in ovirt-engine[master]: core: fix import glance image as template

[derez]

Daniel Erez has uploaded a new change for review.

Change subject: core: fix import glance image as template
......................................................................

core: fix import glance image as template

Importing Glance image as a template from
rest-api leads to an NPE due to null user in
AddVmTemplateCommand [getCurrentUser() is null].

Fixed by ensuring a valid user from the parameters
(instead of setting on ImportRepoImageCommand ctr).

Change-Id: I5a34e200ea135469d174f337b802c83a3a1e9052
Signed-off-by: Daniel Erez <de...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCommand.java
2 files changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/04/37104/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
index fab4caf..824b134 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
@@ -824,7 +824,9 @@
 
     private void addPermission() {
         UniquePermissionsSet permissionsToAdd = new UniquePermissionsSet();
-
+        if (getCurrentUser() == null) {
+            setCurrentUser(getParameters().getParametersCurrentUser());
+        }
         addPermissionForTemplate(permissionsToAdd, getCurrentUser().getId(), 
PredefinedRoles.TEMPLATE_OWNER);
         // if the template is for public use, set EVERYONE as a TEMPLATE_USER.
         if (getParameters().isPublicUse()) {
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCommand.java
index adc95e3..e40395e 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCommand.java
@@ -41,7 +41,6 @@
         super(parameters);
 
         getParameters().setCommandType(getActionType());
-        getParameters().setParametersCurrentUser(getCurrentUser());
     }
 
     protected ProviderProxyFactory getProviderProxyFactory() {


-- 
To view, visit http://gerrit.ovirt.org/37104
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5a34e200ea135469d174f337b802c83a3a1e9052
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Daniel Erez <de...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches