From 7590988dd74aa5c459e9443113385e1b98aa8657 Mon Sep 17 00:00:00 2001
From: Edison Su <sudison@gmail.com>
Date: Thu, 27 Mar 2014 16:11:51 -0700
Subject: [PATCH] CLOUDSTACK-5329: stupid java box/unbox

Conflicts:

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

diff --git a/engine/schema/src/com/cloud/vm/VMInstanceVO.java b/engine/schema/src/com/cloud/vm/VMInstanceVO.java
index 376b8357f03..3d4337f374d 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) {