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 A4A731087C for ; Thu, 22 Aug 2013 21:51:40 +0000 (UTC) Received: (qmail 92710 invoked by uid 500); 22 Aug 2013 21:51:40 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 92660 invoked by uid 500); 22 Aug 2013 21:51:40 -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 92625 invoked by uid 99); 22 Aug 2013 21:51:39 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Aug 2013 21:51:39 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 506F88C2EE4; Thu, 22 Aug 2013 21:51:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mlsorensen@apache.org To: commits@cloudstack.apache.org Date: Thu, 22 Aug 2013 21:51:41 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: updated refs/heads/4.2-forward to e9c99fc CLOUDSTACK-4661: fix vpcid field in response of creating vpn gateway Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e9c99fc0 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e9c99fc0 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e9c99fc0 Branch: refs/heads/4.2-forward Commit: e9c99fc0d467b0c1db27c1dc6897bee5b71dc8c8 Parents: 255c847 Author: Marcus Sorensen Authored: Thu Aug 22 15:17:12 2013 -0600 Committer: Marcus Sorensen Committed: Thu Aug 22 15:19:38 2013 -0600 ---------------------------------------------------------------------- server/src/com/cloud/api/ApiResponseHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e9c99fc0/server/src/com/cloud/api/ApiResponseHelper.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java index 7ffb133..18e0ce3 100755 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -3120,7 +3120,7 @@ public class ApiResponseHelper implements ResponseGenerator { response.setIp(ApiDBUtils.findIpAddressById(result.getAddrId()).getAddress().toString()); Vpc vpc = ApiDBUtils.findVpcById(result.getVpcId()); if (vpc != null) { - response.setVpcId(result.getUuid()); + response.setVpcId(vpc.getUuid()); } response.setRemoved(result.getRemoved()); response.setObjectName("vpngateway");