Removed unused code

Author: harikrishna-patnala

engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/StorageOrchestrator.java

@@ -638,36 +638,6 @@ public DataObjectResult call() {
         }
     }
 
-    private class CopyTemplateTask implements Callable<TemplateApiResult> {
-        private TemplateInfo sourceTmpl;
-        private DataStore destStore;
-        private String logid;
-
-        public CopyTemplateTask(TemplateInfo sourceTmpl, DataStore destStore) {
-            this.sourceTmpl = sourceTmpl;
-            this.destStore = destStore;
-            this.logid = ThreadContext.get(LOGCONTEXTID);
-        }
-
-        @Override
-        public TemplateApiResult call() {
-            ThreadContext.put(LOGCONTEXTID, logid);
-            TemplateApiResult result;
-            AsyncCallFuture<TemplateApiResult> future = templateService.copyTemplateToImageStore(sourceTmpl, destStore);
-            try {
-                result = future.get();
-            } catch (ExecutionException | InterruptedException e) {
-                logger.warn("Exception while copying template [{}] from image store [{}] to image store [{}]: {}",
-                        sourceTmpl.getUniqueName(), sourceTmpl.getDataStore().getName(), destStore.getName(), e.toString());
-                result = new TemplateApiResult(sourceTmpl);
-                result.setResult(e.getMessage());
-            }
-            tryCleaningUpExecutor(destStore.getScope().getScopeId());
-            ThreadContext.clearAll();
-            return result;
-        }
-    }
-
     private class CopyTemplateFromSecondaryStorageTask implements Callable<TemplateApiResult> {
         private final long srcTemplateId;
         private final DataStore destStore;

engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateServiceImpl.java

@@ -69,6 +69,7 @@
 import org.apache.cloudstack.storage.image.datastore.ImageStoreEntity;
 import org.apache.cloudstack.storage.image.store.TemplateObject;
 import org.apache.cloudstack.storage.to.TemplateObjectTO;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
@@ -665,7 +666,7 @@ private boolean searchAndCopyAcrossZones(VMTemplateVO tmplt, DataStore destStore
             List<DataStore> storesInOtherZone = _storeMgr.getImageStoresByZoneIds(otherZoneId);
             logger.debug("Checking zone [{}] for template [{}]...", otherZoneId, tmplt.getUniqueName());
 
-            if (storesInOtherZone == null || storesInOtherZone.isEmpty()) {
+            if (CollectionUtils.isEmpty(storesInOtherZone)) {
                 logger.debug("Zone [{}] has no image stores. Skipping.", otherZoneId);
                 continue;
             }