From 7f6b3c08db5fb3809ffab1a181df2392333f4e24 Mon Sep 17 00:00:00 2001
From: Likitha Shetty <likitha.shetty@citrix.com>
Date: Fri, 31 Jan 2014 10:52:02 +0530
Subject: [PATCH] CLOUDSTACK-5998. [AWSAPI] describe addresses call returns a
 fault with "domain cannot be null!!".

---
 awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java b/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java
index dac18e42d20..d44f1d1101e 100644
--- a/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java
+++ b/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java
@@ -1977,6 +1977,7 @@ public class EC2SoapServiceImpl implements AmazonEC2SkeletonInterface {
             DescribeAddressesResponseItemType item = new DescribeAddressesResponseItemType();
             item.setPublicIp(addr.getIpAddress());
             item.setInstanceId(addr.getAssociatedInstanceId());
+            item.setDomain("standard"); // Since VPC is not supported by AWSAPI default to 'standard'
             items.add(item);
         }
         DescribeAddressesResponseInfoType descAddrRespInfoType = new DescribeAddressesResponseInfoType();