Martin Mucha has uploaded a new change for review.

Change subject: dfdfdf <core | restapi | tools | history | engine | userportal 
| webadmin>: short summary under 50 chars
......................................................................

dfdfdf
<core | restapi | tools | history | engine | userportal | webadmin>: short 
summary under 50 chars

Longer description using lines' length under 72 chars.

With multiple paragraphs if necessary.

Change-Id: I7d799523fda21e0d4a77957b6ebcca8436954475
Bug-Url: https://bugzilla.redhat.com/??????
Signed-off-by: Martin Mucha <mmu...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/HostSetupNetworksCommand.java
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/97/38897/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/HostSetupNetworksCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/HostSetupNetworksCommand.java
index c9f3ad7..be6ab3d 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/HostSetupNetworksCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/HostSetupNetworksCommand.java
@@ -216,8 +216,9 @@
     }
 
     private boolean networkMoved(NetworkAttachment updatedNetworkAttachment, 
NetworkAttachment originalNetworkAttachment) {
-        return 
!originalNetworkAttachment.getNicId().equals(updatedNetworkAttachment.getNicId())
 ||
-                
!originalNetworkAttachment.getNetworkId().equals(updatedNetworkAttachment.getNetworkId());
+        return (originalNetworkAttachment != null) &&
+                
(!originalNetworkAttachment.getNicId().equals(updatedNetworkAttachment.getNicId())
 ||
+                        
!originalNetworkAttachment.getNetworkId().equals(updatedNetworkAttachment.getNetworkId()));
 
     }
 


-- 
To view, visit https://gerrit.ovirt.org/38897
To unsubscribe, visit https://gerrit.ovirt.org/settings

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

Reply via email to