Greg Padgett has uploaded a new change for review.
Change subject: core: set active image after Live Merge of active layer
......................................................................
core: set active image after Live Merge of active layer
Live Merging the active layer should mark the new active image.
Change-Id: Ifc2777257b85c52011aa3bd7c9ad56c2ea680b63
Signed-off-by: Greg Padgett <gpadg...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskLiveCommand.java
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/06/30606/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskLiveCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskLiveCommand.java
index ba9422b..30276d4 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskLiveCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskLiveCommand.java
@@ -287,6 +287,10 @@
topImage.getImage().setSnapshotId(baseImage.getImage().getSnapshotId());
baseImage.getImage().setSnapshotId(oldTopSnapshotId);
+ boolean oldTopIsActive = topImage.getImage().isActive();
+ topImage.getImage().setActive(baseImage.getImage().isActive());
+ baseImage.getImage().setActive(oldTopIsActive);
+
topImage.setImageStatus(ImageStatus.OK);
getBaseDiskDao().update(topImage);
getImageDao().update(topImage.getImage());
--
To view, visit http://gerrit.ovirt.org/30606
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifc2777257b85c52011aa3bd7c9ad56c2ea680b63
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.5
Gerrit-Owner: Greg Padgett <gpadg...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
