[Engine-patches] Change in ovirt-engine[master]: core: removing org.apache.commons.lang dependency (5/X)

[gchaplik]

Gilad Chaplik has uploaded a new change for review.

Change subject: core: removing org.apache.commons.lang dependency (5/X)
......................................................................

core: removing org.apache.commons.lang dependency (5/X)

motivation: VdsSelector will move to sla package, hence
removing !must dependencies.
using native code for StringUtils.equals

Change-Id: If5ae48b1cc36f466e43fec1e8f66aa96e6f5fb5f
Signed-off-by: Gilad Chaplik <gchap...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsSelector.java
1 file changed, 4 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/15/13115/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsSelector.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsSelector.java
index 4f221c7..3971c85 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsSelector.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsSelector.java
@@ -6,7 +6,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang.StringUtils;
 import org.ovirt.engine.core.common.businessentities.Entities;
 import org.ovirt.engine.core.common.businessentities.MigrationSupport;
 import org.ovirt.engine.core.common.businessentities.VDS;
@@ -422,7 +421,10 @@
             } else {
                 for (final VdsNetworkInterface vdsIf : allInterfacesForVds) {
                     if (!networkRequiredOnVds(vmIf, networksByName, 
onlyRequiredNetworks)
-                            || StringUtils.equals(vmIf.getNetworkName(), 
vdsIf.getNetworkName())) {
+                            || (vmIf.getNetworkName() == vdsIf.getNetworkName()
+                                    || (vmIf.getNetworkName() == null && 
vdsIf.getNetworkName() == null)
+                                    || (vmIf.getNetworkName() != null && 
vmIf.getNetworkName()
+                                    .equals(vdsIf.getNetworkName())))) {
                         found = true;
                         break;
                     }


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

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