cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mlsoren...@apache.org
Subject [1/3] git commit: updated refs/heads/master to 6207251
Date Thu, 22 Aug 2013 21:51:39 GMT
Updated Branches:
  refs/heads/4.1 2a20d5cf6 -> b41ef1df9
  refs/heads/4.2-forward 255c8473d -> e9c99fc0d
  refs/heads/master b3306497f -> 62072514f


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/62072514
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/62072514
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/62072514

Branch: refs/heads/master
Commit: 62072514f02881c57487e762167342cdd017e92c
Parents: b330649
Author: Marcus Sorensen <marcus@betterservers.com>
Authored: Thu Aug 22 15:17:12 2013 -0600
Committer: Marcus Sorensen <marcus@betterservers.com>
Committed: Thu Aug 22 15:17:12 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/62072514/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 dca4148..c771431 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -3149,7 +3149,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