Updated Branches: refs/heads/master a1d7016b9 -> aeb024723
CLOUDSTACK-2942 Fixed issue in private gateway network acl Signed-off-by: Abhinandan Prateek <aprat...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/aeb02472 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/aeb02472 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/aeb02472 Branch: refs/heads/master Commit: aeb024723a34e8c8386a62e5961ad5b99852de97 Parents: a1d7016 Author: Jayapal <jayapalreddy.ur...@citrix.com> Authored: Thu Jun 13 14:00:48 2013 +0530 Committer: Abhinandan Prateek <aprat...@apache.org> Committed: Thu Jun 13 14:30:19 2013 +0530 ---------------------------------------------------------------------- .../src/com/cloud/hypervisor/vmware/resource/VmwareResource.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aeb02472/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java index 3123382..1f5eac2 100755 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java @@ -1261,9 +1261,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa if (!result.first()) { String msg = "SetNetworkACLAnswer on domain router " + routerIp + " failed. message: " + result.second(); s_logger.error(msg); + return new SetNetworkACLAnswer(cmd, false, results); } - - return new SetNetworkACLAnswer(cmd, false, results); } else { args=""; args += " -d " + "eth" + ethDeviceNum;
