CLOUDSTACK-5998. [AWSAPI] describe addresses call returns a fault with "domain cannot be null!!".

Likitha Shetty · Likitha Shetty · commit 7f6b3c08db5f · 2014-01-31T10:52:50.000+05:30
diff --git a/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java b/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java
@@ -1977,6 +1977,7 @@ public static DescribeAddressesResponse toDescribeAddressesResponse(EC2DescribeA
             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();

Original file line number	Diff line number	Diff line change
`@@ -1977,6 +1977,7 @@ public static DescribeAddressesResponse toDescribeAddressesResponse(EC2DescribeA`
`1977`	`1977`	`DescribeAddressesResponseItemType item = new DescribeAddressesResponseItemType();`
`1978`	`1978`	`item.setPublicIp(addr.getIpAddress());`
`1979`	`1979`	`item.setInstanceId(addr.getAssociatedInstanceId());`
	`1980`	`+ item.setDomain("standard"); // Since VPC is not supported by AWSAPI default to 'standard'`
`1980`	`1981`	`items.add(item);`
`1981`	`1982`	`}`
`1982`	`1983`	`DescribeAddressesResponseInfoType descAddrRespInfoType = new DescribeAddressesResponseInfoType();`