You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by li...@apache.org on 2013/06/20 11:08:07 UTC
git commit: updated refs/heads/master to 9df4506
Updated Branches:
refs/heads/master 733ed3622 -> 9df45065d
CLOUDSTACK-3078
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9df45065
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9df45065
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9df45065
Branch: refs/heads/master
Commit: 9df45065d03c3841d40d8a8b0af2e92ad0af6683
Parents: 733ed36
Author: Likitha Shetty <li...@citrix.com>
Authored: Thu Jun 20 14:32:00 2013 +0530
Committer: Likitha Shetty <li...@citrix.com>
Committed: Thu Jun 20 14:34:33 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/9df45065/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");
}