Updated Branches: refs/heads/4.2 0c294a50a -> 836c4c431
CLOUDSTACK-4286. Add one more check for validating vlanrange parameter with "dedicateGuestVlanRange" API Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/836c4c43 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/836c4c43 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/836c4c43 Branch: refs/heads/4.2 Commit: 836c4c4317ac6740ed1ad7d1ab0df8bade5dac70 Parents: 0c294a5 Author: Likitha Shetty <[email protected]> Authored: Tue Aug 13 18:25:59 2013 +0530 Committer: Likitha Shetty <[email protected]> Committed: Tue Aug 13 18:51:24 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/836c4c43/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 6513f43..4169d42 100755 --- a/server/src/com/cloud/network/NetworkServiceImpl.java +++ b/server/src/com/cloud/network/NetworkServiceImpl.java @@ -2956,7 +2956,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { for (int i=0 ; i < existingRanges.size(); i++){ int existingStartVlan = existingRanges.get(i).first(); int existingEndVlan = existingRanges.get(i).second(); - if (startVlan >= existingStartVlan && endVlan <= existingEndVlan) { + if (startVlan <= endVlan && startVlan >= existingStartVlan && endVlan <= existingEndVlan) { exists = true; break; }
