From 32e84feeccf5342dcb1bb39fb3ecc9077a7d89a5 Mon Sep 17 00:00:00 2001
From: edison <edison@cloud.com>
Date: Tue, 23 Nov 2010 14:39:17 -0800
Subject: [PATCH] bug 7308: fix NPE when downloading primarystorage status
 7308: resolved fixed

---
 .../agent/resource/computing/LibvirtComputingResource.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java b/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
index 1be49344cae..3157bd86c35 100644
--- a/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
+++ b/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
@@ -1836,12 +1836,13 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
 				}
 
 				if (secondaryPool != null) {
-					synchronized (getStoragePool(secondaryPool.getUUIDString())) {
+					String uuid = secondaryPool.getUUIDString();
+					synchronized (getStoragePool(uuid)) {
 						secondaryPool.destroy();
 						secondaryPool.undefine();
 						secondaryPool.free();
 					}
-					rmStoragePool(secondaryPool.getUUIDString());
+					rmStoragePool(uuid);
 				}
 			} catch (LibvirtException l) {