git commit: updated refs/heads/4.2 to d9f7c6e

[ko...@apache.org]

Updated Branches:
  refs/heads/4.2 2b82c3e1d -> d9f7c6e53


CLOUDSTACK-3628: [Storage]Migration of data disk from Shared primary to shared/local primary storage is throwing NPE
'Long' value was getting passed to a parameter of type 'long' and in case of null was resulting in NPE


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

Branch: refs/heads/4.2
Commit: d9f7c6e5310ef53b8b09914c4aadfa4d5d1af4a5
Parents: 2b82c3e
Author: Koushik Das <ko...@citrix.com>
Authored: Fri Jul 19 19:08:03 2013 +0530
Committer: Koushik Das <ko...@citrix.com>
Committed: Fri Jul 19 19:15:10 2013 +0530

----------------------------------------------------------------------
 engine/schema/src/com/cloud/storage/VolumeVO.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d9f7c6e5/engine/schema/src/com/cloud/storage/VolumeVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/storage/VolumeVO.java b/engine/schema/src/com/cloud/storage/VolumeVO.java
index bd57f10..3463029 100755
--- a/engine/schema/src/com/cloud/storage/VolumeVO.java
+++ b/engine/schema/src/com/cloud/storage/VolumeVO.java
@@ -172,7 +172,7 @@ public class VolumeVO implements Volume {
         this.uuid = UUID.randomUUID().toString();
     }
 
-    public VolumeVO(String name, long dcId, long podId, long accountId,
+    public VolumeVO(String name, long dcId, Long podId, long accountId,
             long domainId, Long instanceId, String folder, String path,
             long size, Long minIops, Long maxIops, String iScsiName,
             Volume.Type vType) {