From 4eefce15be81dd83e1a6e8e654989813f68e0e38 Mon Sep 17 00:00:00 2001
From: Edison Su <sudison@gmail.com>
Date: Wed, 31 Jul 2013 15:46:17 -0700
Subject: [PATCH] CLOUDSTACK-3950: the issue can be reproduced by: copy iso
 failed during the first time, for some reason, then copy the same iso again,
 the issue be triggered.

---
 .../storage/download/DownloadMonitorImpl.java | 20 -------------------
 1 file changed, 20 deletions(-)

diff --git a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
index f0550855bb5..0bb1a865358 100755
--- a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
+++ b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
@@ -103,10 +103,6 @@ public class DownloadMonitorImpl extends ManagerBase implements DownloadMonitor
     @Inject
     DataStoreManager storeMgr;
 
-    final Map<TemplateDataStoreVO, DownloadListener> _listenerTemplateMap = new ConcurrentHashMap<TemplateDataStoreVO, DownloadListener>();
-    final Map<VolumeDataStoreVO, DownloadListener> _listenerVolMap = new ConcurrentHashMap<VolumeDataStoreVO, DownloadListener>();
-
-
     @Override
     public boolean configure(String name, Map<String, Object> params) {
         final Map<String, String> configs = _configDao.getConfiguration("ManagementServer", params);
@@ -189,15 +185,6 @@ public class DownloadMonitorImpl extends ManagerBase implements DownloadMonitor
                 dl.setCurrState(vmTemplateStore.getDownloadState());
             }
 
-            DownloadListener old = null;
-            synchronized (_listenerTemplateMap) {
-                old = _listenerTemplateMap.put(vmTemplateStore, dl);
-            }
-            if (old != null) {
-                s_logger.info("abandon obsolete download listener");
-                old.abandon();
-            }
-
             try {
                 ep.sendMessageAsync(dcmd, new UploadListener.Callback(ep.getId(), dl));
             } catch (Exception e) {
@@ -270,13 +257,6 @@ public class DownloadMonitorImpl extends ManagerBase implements DownloadMonitor
             if (downloadJobExists) {
                 dl.setCurrState(volumeHost.getDownloadState());
             }
-            DownloadListener old = null;
-            synchronized (_listenerVolMap) {
-                old = _listenerVolMap.put(volumeHost, dl);
-            }
-            if (old != null) {
-                old.abandon();
-            }
 
             try {
                 ep.sendMessageAsync(dcmd, new UploadListener.Callback(ep.getId(), dl));