You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2013/06/27 22:57:23 UTC
[21/50] [abbrv] git commit: updated refs/heads/vmsync to 3c2aa18
CLOUDSTACK-3206. CreateVlanIpRange fails with IndexOutOfBoundsException.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/55f0e167
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/55f0e167
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/55f0e167
Branch: refs/heads/vmsync
Commit: 55f0e167ecda92bf4731eeff2a56b2ad22a3be21
Parents: 3bb4ec9
Author: Likitha Shetty <li...@citrix.com>
Authored: Wed Jun 26 14:58:45 2013 +0530
Committer: Likitha Shetty <li...@citrix.com>
Committed: Wed Jun 26 14:59:36 2013 +0530
----------------------------------------------------------------------
server/src/com/cloud/configuration/ConfigurationManagerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/55f0e167/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index 26dc088..041f29a 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<VlanVO> 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)) {