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 4480f67
Date Thu, 20 Jun 2013 09:13:13 GMT
Updated Branches:
  refs/heads/master-6-17-stable 657978ed1 -> 4480f67ea


CLOUDSTACK-3078


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4480f67e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4480f67e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4480f67e

Branch: refs/heads/master-6-17-stable
Commit: 4480f67ea645e5d566ee66c16bde2c783b2c2614
Parents: 657978e
Author: Likitha Shetty <likitha.shetty@citrix.com>
Authored: Thu Jun 20 14:32:00 2013 +0530
Committer: Likitha Shetty <likitha.shetty@citrix.com>
Committed: Thu Jun 20 14:39:13 2013 +0530

----------------------------------------------------------------------
 server/src/com/cloud/network/NetworkServiceImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4480f67e/server/src/com/cloud/network/NetworkServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java
index 791b288..25cd887 100755
--- a/server/src/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/com/cloud/network/NetworkServiceImpl.java
@@ -2978,7 +2978,7 @@ public class NetworkServiceImpl extends ManagerBase implements  NetworkService
{
         PhysicalNetworkVO physicalNetwork = _physicalNetworkDao.findById(physicalNetworkId);
         if (physicalNetwork == null ) {
             throw new InvalidParameterValueException("Unable to find physical network by
id " + physicalNetworkId);
-        } else if (physicalNetwork.getIsolationMethods() != null && !physicalNetwork.getIsolationMethods().contains("VLAN"))
{
+        } else if (!physicalNetwork.getIsolationMethods().isEmpty() && !physicalNetwork.getIsolationMethods().contains("VLAN"))
{
             throw new InvalidParameterValueException("Cannot dedicate guest vlan range. "
+
                     "Physical isolation type of network " + physicalNetworkId + " is not
VLAN");
         }


Mime
View raw message