Shahar Havivi has uploaded a new change for review.
Change subject: engine: Spice cannot start if domain is null
......................................................................
engine: Spice cannot start if domain is null
Vm.getVmHost() return null for host name if the VmInit is null.
Change-Id: I556150281d7d4417fff1dc9590a011baf6c17207
Signed-off-by: Shahar Havivi <shav...@redhat.com>
---
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java
1 file changed, 2 insertions(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/91/23791/1
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java
index 51443d9..90a65c3 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java
@@ -451,12 +451,11 @@
}
public String getVmHost() {
+ String vmDomain = (getVmInit() != null) ? getVmInit().getDomain() :
null;
String vmHost = this.vmDynamic.getVmHost();
if (!StringHelper.isNullOrEmpty(this.getVmIp())) {
this.vmDynamic.setVmHost(getVmIp());
- } else if (getVmInit() != null) {
- String vmDomain = getVmInit().getDomain();
-
+ } else {
// If VM's host name isn't available - set as VM's name
// If no IP address is available - assure that 'vm_host' is FQN by
concatenating
// vmHost and vmDomain.
--
To view, visit http://gerrit.ovirt.org/23791
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I556150281d7d4417fff1dc9590a011baf6c17207
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.4
Gerrit-Owner: Shahar Havivi <shav...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
