[Engine-patches] Change in ovirt-engine[master]: core: ImagesHandler cleanup: remove useless const

[amureini]

Allon Mureinik has uploaded a new change for review.

Change subject: core: ImagesHandler cleanup: remove useless const
......................................................................

core: ImagesHandler cleanup: remove useless const

Removed the useless BlankImageTemplateId constant which is just another
copy of Guid.Empty.

Change-Id: If0794165fbebf1226134259fcb67bc0d753f75ee
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateImageTemplateCommand.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommand.java
4 files changed, 4 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/96/10996/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateImageTemplateCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateImageTemplateCommand.java
index 468d466..0205903 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateImageTemplateCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateImageTemplateCommand.java
@@ -69,8 +69,8 @@
                 getParameters().getDiskAlias() : 
getDiskImage().getDiskAlias());
         newImage.setvm_snapshot_id(getParameters().getVmSnapshotId());
         newImage.setQuotaId(getParameters().getQuotaId());
-        newImage.setParentId(ImagesHandler.BlankImageTemplateId);
-        newImage.setit_guid(ImagesHandler.BlankImageTemplateId);
+        newImage.setParentId(Guid.Empty);
+        newImage.setit_guid(Guid.Empty);
         newImage.setstorage_ids(new 
ArrayList<Guid>(Arrays.asList(getParameters().getDestinationStorageDomainId())));
         newImage.setactive(true);
         saveImage(newImage);
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java
index 76cc536..8edf4dd 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java
@@ -53,7 +53,6 @@
 
 public final class ImagesHandler {
     public static final String DISK = "_Disk";
-    public static final Guid BlankImageTemplateId = new 
Guid("00000000-0000-0000-0000-000000000000");
     public static final String DefaultDriveName = "1";
     private static final Log log = LogFactory.getLog(ImagesHandler.class);
 
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java
index 604ee77..5013bc9 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java
@@ -251,7 +251,7 @@
     protected boolean checkTemplateInDestStorageDomain() {
         boolean retValue = true;
         if (getParameters().getOperation() == ImageOperation.Move
-                && 
!ImagesHandler.BlankImageTemplateId.equals(getImage().getit_guid())) {
+                && !Guid.Empty.equals(getImage().getit_guid())) {
             DiskImage templateImage = 
getDiskImageDao().get(getImage().getit_guid());
             if 
(!templateImage.getstorage_ids().contains(getParameters().getStorageDomainId()))
 {
                 retValue = false;
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommand.java
index f534eb9..76bb66b 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommand.java
@@ -245,7 +245,7 @@
     private boolean isTemplateInDestStorageDomain(Guid imageId, Guid 
sourceDomainId) {
         Guid templateId = getDiskImageById(imageId).getit_guid();
 
-        if (!ImagesHandler.BlankImageTemplateId.equals(templateId)) {
+        if (!Guid.Empty.equals(templateId)) {
             DiskImage templateImage = getDiskImageDao().get(templateId);
             if (!templateImage.getstorage_ids().contains(sourceDomainId)) {
                 return 
failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_TEMPLATE_NOT_FOUND_ON_DESTINATION_DOMAIN);


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

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