[Engine-patches] Change in ovirt-engine[master]: bll: fix incorrect merge caused from 1bc94d8c9a6

[Alon Bar-Lev]

Alon Bar-Lev has uploaded a new change for review.

Change subject: bll: fix incorrect merge caused from 1bc94d8c9a6
......................................................................

bll: fix incorrect merge caused from 1bc94d8c9a6

Change-Id: Ie97c1b93a8f791a4caecc201801a217f89b0e11f
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ProcessDownVmCommand.java
1 file changed, 2 insertions(+), 20 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/75/28875/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ProcessDownVmCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ProcessDownVmCommand.java
index 76faf22..2462114 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ProcessDownVmCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ProcessDownVmCommand.java
@@ -158,11 +158,7 @@
      * Update vm configuration with NEXT_RUN configuration, if exists
      * @param vmId
      */
-<<<<<<< HEAD
     private void applyNextRunConfiguration() {
-=======
-    private void ApplyNextRunConfiguration(Guid vmId) {
->>>>>>> core: Introducing runInternalXXX at CommandBase
         // Remove snpashot first, in case other update is in progress, it will 
block this one with exclusive lock
         // and any newer update should be preffered to this one.
         Snapshot runSnap = getSnapshotDAO().get(getVmId(), 
SnapshotType.NEXT_RUN);
@@ -173,12 +169,7 @@
             // override creation date because the value in the config is the 
creation date of the config, not the vm
             getVm().setVmCreationDate(originalCreationDate);
 
-<<<<<<< HEAD
-            Backend.getInstance().runInternalAction(VdcActionType.UpdateVm, 
createUpdateVmParameters());
-=======
-                runInternalAction(VdcActionType.UpdateVm, updateVmParams);
-            }
->>>>>>> core: Introducing runInternalXXX at CommandBase
+            runInternalAction(VdcActionType.UpdateVm, updateVmParams);
         }
     }
 
@@ -229,21 +220,12 @@
         return updateVmParams;
     }
 
-<<<<<<< HEAD
     private void removeVmStatelessImages() {
         if (getSnapshotDAO().exists(getVmId(), SnapshotType.STATELESS)) {
             log.infoFormat("Deleting snapshot for stateless vm {0}", 
getVmId());
-            
Backend.getInstance().runInternalAction(VdcActionType.RestoreStatelessVm,
+            runInternalAction(VdcActionType.RestoreStatelessVm,
                     new VmOperationParameterBase(getVmId()),
                     
ExecutionHandler.createDefaultContexForTasks(getExecutionContext(), getLock()));
-=======
-    private void removeVmStatelessImages(Guid vmId, CommandContext context) {
-        if (DbFacade.getInstance().getSnapshotDao().exists(vmId, 
SnapshotType.STATELESS)) {
-            log.infoFormat("Deleting snapshot for stateless vm {0}", vmId);
-            runInternalAction(VdcActionType.RestoreStatelessVm,
-                    new VmOperationParameterBase(vmId),
-                    context);
->>>>>>> core: Introducing runInternalXXX at CommandBase
         }
     }
 }


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie97c1b93a8f791a4caecc201801a217f89b0e11f
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches