[24/27] git commit: updated refs/heads/master to d4d5cab

[anthonyxu]

CLOUDSTACK-5329: stupid java box/unbox

Conflicts:

        engine/schema/src/com/cloud/vm/VMInstanceVO.java


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

Branch: refs/heads/master
Commit: 7590988dd74aa5c459e9443113385e1b98aa8657
Parents: 7b9d0d3
Author: Edison Su <sudi...@gmail.com>
Authored: Thu Mar 27 16:11:51 2014 -0700
Committer: Anthony Xu <anthony...@citrix.com>
Committed: Fri Mar 28 16:24:22 2014 -0700

----------------------------------------------------------------------
 engine/schema/src/com/cloud/vm/VMInstanceVO.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7590988d/engine/schema/src/com/cloud/vm/VMInstanceVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/vm/VMInstanceVO.java 
b/engine/schema/src/com/cloud/vm/VMInstanceVO.java
index 376b835..3d4337f 100644
--- a/engine/schema/src/com/cloud/vm/VMInstanceVO.java
+++ b/engine/schema/src/com/cloud/vm/VMInstanceVO.java
@@ -417,8 +417,8 @@ public class VMInstanceVO implements VirtualMachine, 
FiniteStateObject<State, Vi
         return podIdToDeployIn;
     }
 
-    public void setPodId(long podId) {
-        podIdToDeployIn = podId;
+    public void setPodId(Long podId) {
+        this.podIdToDeployIn = podId;
     }
 
     public void setPrivateMacAddress(String privateMacAddress) {