apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

use -1 instead of null

Browse Source
This commit is contained in:
anthony 2010-09-10 13:03:08 -07:00
parent 15a6631a87
commit f9bb54d7e2
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
View File

@ -1946,22 +1946,21 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR
for (VIF vif : vifs) { for (VIF vif : vifs) {
Network network = vif.getNetwork(conn); Network network = vif.getNetwork(conn);
Set<PIF> pifs = network.getPIFs(conn); Set<PIF> pifs = network.getPIFs(conn);
Long vlan = null; long vlan = -1;
PIF npif = null; PIF npif = null;
for (PIF pif : pifs) { for (PIF pif : pifs) {
try { try {
vlan = pif.getVLAN(conn); vlan = pif.getVLAN(conn);
if (vlan != null) { if (vlan != -1 ) {
VLAN vland = pif.getVLANMasterOf(conn); VLAN vland = pif.getVLANMasterOf(conn);
npif = vland.getTaggedPIF(conn); npif = vland.getTaggedPIF(conn);
break;
} }
break;
}catch (Exception e) { }catch (Exception e) {
vlan = null;
continue; continue;
} }
} }
if (vlan == null) { if (npif == null) {
continue; continue;
} }
network = npif.getNetwork(conn); network = npif.getNetwork(conn);