diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java index 26dc0888710..041f29a6d52 100755 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -2685,8 +2685,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati } List vlans = _vlanDao.listVlansByNetworkId(network.getId()); - VlanVO vlan = vlans.get(0); if (vlans != null && vlans.size() > 0) { + VlanVO vlan = vlans.get(0); if (vlanId == null) { vlanId = vlan.getVlanTag(); } else if (!vlan.getVlanTag().equals(vlanId)) {