cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From likit...@apache.org
Subject git commit: updated refs/heads/master-6-17-stable to 4e55571
Date Wed, 26 Jun 2013 09:24:13 GMT
Updated Branches:
  refs/heads/master-6-17-stable 8eeefad97 -> 4e5557152


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/4e555715
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4e555715
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4e555715

Branch: refs/heads/master-6-17-stable
Commit: 4e5557152fe0f8f3b967c67d61f62e77a63c0e37
Parents: 8eeefad
Author: Likitha Shetty <likitha.shetty@citrix.com>
Authored: Wed Jun 26 14:49:04 2013 +0530
Committer: Likitha Shetty <likitha.shetty@citrix.com>
Committed: Wed Jun 26 14:50:22 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/4e555715/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 22bb883..cb4f76b 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -2529,8 +2529,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)) {


Mime
View raw message