cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edi...@apache.org
Subject [17/18] git commit: updated refs/heads/object_store to c476d78
Date Thu, 16 May 2013 02:42:30 GMT
CLOUDSTACK-2482: fix create volume from snapshot


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

Branch: refs/heads/object_store
Commit: c476d7866ec648c648adbe30ddae07fb804e5548
Parents: 3bf1050
Author: Edison Su <sudison@gmail.com>
Authored: Wed May 15 19:41:21 2013 -0700
Committer: Edison Su <sudison@gmail.com>
Committed: Wed May 15 19:41:50 2013 -0700

----------------------------------------------------------------------
 .../storage/volume/VolumeServiceImpl.java          |    4 ++--
 .../ElementChildTestConfiguration.java             |    2 +-
 .../internallbvmmgr/LbChildTestConfiguration.java  |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c476d786/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
----------------------------------------------------------------------
diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
index 48160f4..ba4693c 100644
--- a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
+++ b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
@@ -507,7 +507,7 @@ public class VolumeServiceImpl implements VolumeService {
 
         try {
         	DataObject volumeOnStore = store.create(volume);
-        	volume.processEvent(Event.CreateOnlyRequested);
+        	volumeOnStore.processEvent(Event.CreateOnlyRequested);
         	snapshot.processEvent(Event.CopyingRequested);
         	 CreateVolumeFromBaseImageContext<VolumeApiResult> context = new CreateVolumeFromBaseImageContext<VolumeApiResult>(null,
         			 volume, store, volumeOnStore, future, snapshot);
@@ -528,7 +528,7 @@ public class VolumeServiceImpl implements VolumeService {
     protected Void createVolumeFromSnapshotCallback(AsyncCallbackDispatcher<VolumeServiceImpl,
CopyCommandResult> callback,
     		CreateVolumeFromBaseImageContext<VolumeApiResult> context) {
     	CopyCommandResult result = callback.getResult();
-    	VolumeInfo volume = (VolumeInfo)context.vo;
+    	VolumeInfo volume = (VolumeInfo)context.templateOnStore;
     	SnapshotInfo snapshot = context.snapshot;
     	VolumeApiResult apiResult = new VolumeApiResult(volume);
     	Event event = null;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c476d786/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbelement/ElementChildTestConfiguration.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbelement/ElementChildTestConfiguration.java
b/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbelement/ElementChildTestConfiguration.java
index 8a67e84..bddf713 100644
--- a/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbelement/ElementChildTestConfiguration.java
+++ b/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbelement/ElementChildTestConfiguration.java
@@ -46,7 +46,7 @@ import com.cloud.vm.dao.DomainRouterDao;
 @Configuration
 @ComponentScan(
     basePackageClasses={
-            NetUtils.class,
+            NetUtils.class
     },
     includeFilters={@Filter(value=ElementChildTestConfiguration.Library.class, type=FilterType.CUSTOM)},
     useDefaultFilters=false

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c476d786/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbvmmgr/LbChildTestConfiguration.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbvmmgr/LbChildTestConfiguration.java
b/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbvmmgr/LbChildTestConfiguration.java
index 74e54b2..4f03b27 100644
--- a/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbvmmgr/LbChildTestConfiguration.java
+++ b/plugins/network-elements/internal-loadbalancer/test/org/apache/cloudstack/internallbvmmgr/LbChildTestConfiguration.java
@@ -56,7 +56,7 @@ import com.cloud.user.dao.AccountDao;
 @Configuration
 @ComponentScan(
     basePackageClasses={
-            NetUtils.class,
+            NetUtils.class
     },
     includeFilters={@Filter(value=LbChildTestConfiguration.Library.class, type=FilterType.CUSTOM)},
     useDefaultFilters=false


Mime
View raw message