From 56e37243b83371c46dddeee18e48d82e16f87d9e Mon Sep 17 00:00:00 2001
From: Likitha Shetty <likitha.shetty@citrix.com>
Date: Tue, 15 Jul 2014 12:55:48 +0530
Subject: [PATCH] CLOUDSTACK-7114. [EC2 QueryAPI] Inconsistency in mapping the
 "Allocated" state of a Volume to "Available".

---
 awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java
index 4879a4b6d45..41fe56e3308 100644
--- a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java
+++ b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java
@@ -1231,7 +1231,9 @@ public class EC2Engine extends ManagerBase {
                 resp.setInstanceId(vol.getVirtualMachineId());
                 resp.setSize(vol.getSize());
                 resp.setSnapshotId(vol.getSnapshotId());
-                resp.setState(vol.getState());
+                if (vol.getState() != null) {
+                    resp.setState(mapToAmazonVolState(vol.getState()));
+                }
                 resp.setType(vol.getVolumeType());
                 resp.setVMState(vol.getVirtualMachineState());
                 resp.setAttachmentState("detached");