cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anim...@apache.org
Subject [1/4] git commit: updated refs/heads/4.2 to 6ba0c7e
Date Thu, 22 Aug 2013 23:03:54 GMT
Updated Branches:
  refs/heads/4.2 99564b381 -> 6ba0c7e67


CLOUDSTACK-4661: fix vpcid field in response of creating vpn gateway
(cherry picked from commit e9c99fc0d467b0c1db27c1dc6897bee5b71dc8c8)

Signed-off-by: animesh <animesh@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/60e68ab9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/60e68ab9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/60e68ab9

Branch: refs/heads/4.2
Commit: 60e68ab9ed3fb16f1a31015ed3d4f6309cc134db
Parents: 99564b3
Author: Marcus Sorensen <marcus@betterservers.com>
Authored: Thu Aug 22 15:17:12 2013 -0600
Committer: animesh <animesh@apache.org>
Committed: Thu Aug 22 15:46:20 2013 -0700

----------------------------------------------------------------------
 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/60e68ab9/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");


Mime
View raw message