From d5bded3d6db217959da45cb96089a26786fed16e Mon Sep 17 00:00:00 2001
From: alena <alena@cloud.com>
Date: Tue, 1 Feb 2011 16:07:00 -0800
Subject: [PATCH] PublicNetworkGuru: fixed NPE in ipUnassign

---
 server/src/com/cloud/network/guru/PublicNetworkGuru.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/server/src/com/cloud/network/guru/PublicNetworkGuru.java b/server/src/com/cloud/network/guru/PublicNetworkGuru.java
index bab754d37a7..a7052f6e390 100644
--- a/server/src/com/cloud/network/guru/PublicNetworkGuru.java
+++ b/server/src/com/cloud/network/guru/PublicNetworkGuru.java
@@ -154,7 +154,9 @@ public class PublicNetworkGuru extends AdapterBase implements NetworkGuru {
     @Override
     public void deallocate(Network network, NicProfile nic, VirtualMachineProfile<? extends VirtualMachine> vm) {
         IPAddressVO ip = _ipAddressDao.findByAccountAndIp(vm.getVirtualMachine().getAccountId(), nic.getIp4Address());
-        _ipAddressDao.unassignIpAddress(ip.getId());
+        if (ip != null) {
+            _ipAddressDao.unassignIpAddress(ip.getId());
+        }
         nic.deallocate();
     }