Return-Path: 
 <commits-return-21919-apmail-cloudstack-commits-archive=cloudstack.apache.org@cloudstack.apache.org>
X-Original-To: apmail-cloudstack-commits-archive@www.apache.org
Delivered-To: apmail-cloudstack-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id CC7EEDF67
	for <apmail-cloudstack-commits-archive@www.apache.org>;
 Mon, 20 May 2013 18:47:39 +0000 (UTC)
Received: (qmail 27462 invoked by uid 500); 20 May 2013 18:47:36 -0000
Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org
Received: (qmail 27026 invoked by uid 500); 20 May 2013 18:47:36 -0000
Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cloudstack.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cloudstack.apache.org>
List-Post: <mailto:commits@cloudstack.apache.org>
List-Id: <commits.cloudstack.apache.org>
Reply-To: dev@cloudstack.apache.org
Delivered-To: mailing list commits@cloudstack.apache.org
Received: (qmail 19326 invoked by uid 99); 20 May 2013 18:47:18 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 May 2013 18:47:18 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id BA9C7890710; Mon, 20 May 2013 18:47:17 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: ahuang@apache.org
To: commits@cloudstack.apache.org
Date: Mon, 20 May 2013 18:47:47 -0000
Message-Id: <5e6d4db1311b482f8b23cfe0a792e3d9@git.apache.org>
In-Reply-To: <1d4553b1ce734f78884df1a3d47593bc@git.apache.org>
References: <1d4553b1ce734f78884df1a3d47593bc@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [32/50] [abbrv] git commit: updated refs/heads/vmsync to 05cb734

Fixed CLOUDSTACK-2081 Volume which is added thru upload volume is failed to attach to the instance saying Volume state must be in Allocated, Ready or in Uploaded state( Though uploaded Volume state is uploaded)


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

Branch: refs/heads/vmsync
Commit: 107f4924757d6d59bff4256a56df3c8e81763818
Parents: 28c5fbc
Author: Rajesh Battala <rajesh.battala@citrix.com>
Authored: Thu May 9 18:02:41 2013 +0530
Committer: Devdeep Singh <devdeep@gmail.com>
Committed: Fri May 17 14:58:25 2013 +0530

----------------------------------------------------------------------
 .../storage/volume/VolumeServiceImpl.java          |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/107f4924/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
----------------------------------------------------------------------
diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
index 2625354..7fdf6bb 100644
--- a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
+++ b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
@@ -748,11 +748,11 @@ public class VolumeServiceImpl implements VolumeService {
     protected Void registerVolumeCallback(AsyncCallbackDispatcher<VolumeServiceImpl, CreateCmdResult> callback, CreateVolumeContext<VolumeApiResult> context) {
         CreateCmdResult result = callback.getResult();
         VolumeObject vo = (VolumeObject)context.volume;
-        /*if (result.isFailed()) {
+        if (result.isFailed()) {
             vo.stateTransit(Volume.Event.OperationFailed);
         } else {
             vo.stateTransit(Volume.Event.OperationSucceeded);
-        }*/
+        }
         VolumeApiResult res = new VolumeApiResult(vo);
         context.future.complete(res);
         return null;