From e6faa47a4b4ab5b9c6490c05db067e32f37d2e45 Mon Sep 17 00:00:00 2001
From: Min Chen <min.chen@citrix.com>
Date: Mon, 13 May 2013 11:36:44 -0700
Subject: [PATCH] Remove unnecessary state machine entry after refactoring
 sendMessageAsyncWithListener to use sendMessageAsync.

---
 .../storage/image/manager/ImageDataManagerImpl.java         | 2 --
 .../storage/datastore/ObjectInDataStoreManagerImpl.java     | 3 ---
 server/src/com/cloud/storage/upload/UploadListener.java     | 6 ------
 3 files changed, 11 deletions(-)

diff --git a/engine/storage/image/src/org/apache/cloudstack/storage/image/manager/ImageDataManagerImpl.java b/engine/storage/image/src/org/apache/cloudstack/storage/image/manager/ImageDataManagerImpl.java
index d8708308cef..f9dd5a6e2cc 100644
--- a/engine/storage/image/src/org/apache/cloudstack/storage/image/manager/ImageDataManagerImpl.java
+++ b/engine/storage/image/src/org/apache/cloudstack/storage/image/manager/ImageDataManagerImpl.java
@@ -41,8 +41,6 @@ public class ImageDataManagerImpl implements ImageDataManager {
         stateMachine.addTransition(TemplateState.Destroying, TemplateEvent.DestroyRequested, TemplateState.Destroying);
         stateMachine.addTransition(TemplateState.Destroying, TemplateEvent.OperationFailed, TemplateState.Destroying);
         stateMachine.addTransition(TemplateState.Destroying, TemplateEvent.OperationSucceeded, TemplateState.Destroyed);
-        //TODO: this should not be needed, but it happened during testing where multiple success event is sent to callback
-        stateMachine.addTransition(TemplateState.Ready, TemplateEvent.OperationSucceeded, TemplateState.Ready);
     }
 
     @Override
diff --git a/engine/storage/src/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java b/engine/storage/src/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java
index 269ef055f5e..78c3184dde1 100644
--- a/engine/storage/src/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java
@@ -108,9 +108,6 @@ public class ObjectInDataStoreManagerImpl implements ObjectInDataStoreManager {
                 State.Destroyed);
         stateMachines.addTransition(State.Destroying, Event.OperationFailed,
                 State.Destroying);
-        //TODO: further investigate why an extra event is sent when it is alreay Ready
-        stateMachines.addTransition(State.Ready, Event.OperationSuccessed,
-                State.Ready);
     }
 
     @Override
diff --git a/server/src/com/cloud/storage/upload/UploadListener.java b/server/src/com/cloud/storage/upload/UploadListener.java
index c6f273bb93a..d3b7af9f675 100755
--- a/server/src/com/cloud/storage/upload/UploadListener.java
+++ b/server/src/com/cloud/storage/upload/UploadListener.java
@@ -43,7 +43,6 @@ import com.cloud.agent.api.Answer;
 import com.cloud.agent.api.Command;
 import com.cloud.agent.api.StartupCommand;
 import com.cloud.agent.api.StartupStorageCommand;
-import com.cloud.agent.api.storage.DownloadAnswer;
 import com.cloud.agent.api.storage.UploadAnswer;
 import com.cloud.agent.api.storage.UploadCommand;
 import com.cloud.agent.api.storage.UploadProgressCommand;
@@ -57,7 +56,6 @@ import com.cloud.storage.Upload.Status;
 import com.cloud.storage.Upload.Type;
 import com.cloud.storage.UploadVO;
 import com.cloud.storage.dao.UploadDao;
-import com.cloud.storage.download.DownloadListener;
 import com.cloud.storage.upload.UploadState.UploadEvent;
 import com.cloud.utils.exception.CloudRuntimeException;
 
@@ -477,10 +475,6 @@ public class UploadListener implements Listener {
         @Override
         public void complete(Answer answer) {
             listener.processAnswers(id, -1, new Answer[] {answer});
-            if (listener instanceof DownloadListener) {
-                DownloadListener dwldListener = (DownloadListener)listener;
-                dwldListener.getCallback().complete((DownloadAnswer)answer);
-            }
         }
     }
 }