cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mlsoren...@apache.org
Subject git commit: updated refs/heads/master to a504c00
Date Thu, 17 Oct 2013 23:47:18 GMT
Updated Branches:
  refs/heads/master ec3302afd -> a504c004b


CLOUDSTACK-4887: Fix CLVM template download from storage refactoring work


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

Branch: refs/heads/master
Commit: a504c004bf10555e5ea67ec89fe7bf6f00fe4622
Parents: ec3302a
Author: Marcus Sorensen <marcus@betterservers.com>
Authored: Thu Oct 17 17:46:47 2013 -0600
Committer: Marcus Sorensen <marcus@betterservers.com>
Committed: Thu Oct 17 17:47:11 2013 -0600

----------------------------------------------------------------------
 .../cloud/storage/resource/StorageSubsystemCommandHandlerBase.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a504c004/core/src/com/cloud/storage/resource/StorageSubsystemCommandHandlerBase.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/resource/StorageSubsystemCommandHandlerBase.java b/core/src/com/cloud/storage/resource/StorageSubsystemCommandHandlerBase.java
index 002143f..3ac82e3 100644
--- a/core/src/com/cloud/storage/resource/StorageSubsystemCommandHandlerBase.java
+++ b/core/src/com/cloud/storage/resource/StorageSubsystemCommandHandlerBase.java
@@ -68,7 +68,7 @@ public class StorageSubsystemCommandHandlerBase implements StorageSubsystemComma
         DataStoreTO srcDataStore = srcData.getDataStore();
         DataStoreTO destDataStore = destData.getDataStore();
 
-        if ((srcData.getObjectType() == DataObjectType.TEMPLATE) && (destData.getObjectType()
== DataObjectType.TEMPLATE && destData.getDataStore().getRole() == DataStoreRole.Primary))
{
+        if (srcData.getObjectType() == DataObjectType.TEMPLATE && srcData.getDataStore().getRole()
== DataStoreRole.Image && destData.getDataStore().getRole() == DataStoreRole.Primary)
{
             //copy template to primary storage
             return processor.copyTemplateToPrimaryStorage(cmd);
         } else if (srcData.getObjectType() == DataObjectType.TEMPLATE && srcDataStore.getRole()
== DataStoreRole.Primary && destDataStore.getRole() == DataStoreRole.Primary) {


Mime
View raw message