Remove unnecessary state machine entry after refactoring
sendMessageAsyncWithListener to use sendMessageAsync.

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

Branch: refs/heads/object_store
Commit: e6faa47a4b4ab5b9c6490c05db067e32f37d2e45
Parents: c13a691
Author: Min Chen <[email protected]>
Authored: Mon May 13 11:36:44 2013 -0700
Committer: Min Chen <[email protected]>
Committed: Mon May 13 11:36:44 2013 -0700

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e6faa47a/engine/storage/image/src/org/apache/cloudstack/storage/image/manager/ImageDataManagerImpl.java
----------------------------------------------------------------------
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 d870830..f9dd5a6 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

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e6faa47a/engine/storage/src/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java
----------------------------------------------------------------------
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 269ef05..78c3184 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

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e6faa47a/server/src/com/cloud/storage/upload/UploadListener.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/upload/UploadListener.java 
b/server/src/com/cloud/storage/upload/UploadListener.java
index c6f273b..d3b7af9 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);
-            }
         }
     }
 }

Reply via email to