Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id ADD1D103DE for ; Fri, 12 Jul 2013 23:10:52 +0000 (UTC) Received: (qmail 98184 invoked by uid 500); 12 Jul 2013 23:10:52 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 98160 invoked by uid 500); 12 Jul 2013 23:10:52 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 98153 invoked by uid 99); 12 Jul 2013 23:10:52 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Jul 2013 23:10:52 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5BA9189BAF9; Fri, 12 Jul 2013 23:10:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: edison@apache.org To: commits@cloudstack.apache.org Message-Id: <062637dfada344ee92466bd337115c5c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.2 to 28a85fe Date: Fri, 12 Jul 2013 23:10:52 +0000 (UTC) Updated Branches: refs/heads/4.2 8439209ba -> 28a85fe00 fix compile issue Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/28a85fe0 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/28a85fe0 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/28a85fe0 Branch: refs/heads/4.2 Commit: 28a85fe000bcc8d03599e15957a2cb5bdb998ff5 Parents: 8439209 Author: Edison Su Authored: Fri Jul 12 16:08:10 2013 -0700 Committer: Edison Su Committed: Fri Jul 12 16:08:10 2013 -0700 ---------------------------------------------------------------------- .../src/com/cloud/hypervisor/vmware/resource/VmwareResource.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/28a85fe0/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 76631e3..2d18dc8 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 @@ -2043,7 +2043,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa if (s_logger.isInfoEnabled()) { s_logger.info("Executing createipAlias command: " + _gson.toJson(cmd)); } - cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP); + String routerIp = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP); List ipAliasTOs = cmd.getIpAliasList(); String args=routerIp+" "; for (IpAliasTO ipaliasto : ipAliasTOs) { @@ -2079,7 +2079,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa } protected Answer execute(final DeleteIpAliasCommand cmd) { - cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP); + String routerIp = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP); List revokedIpAliasTOs = cmd.getDeleteIpAliasTos(); List activeIpAliasTOs = cmd.getCreateIpAliasTos(); if (s_logger.isInfoEnabled()) {