From 52c4f00b266eb4e7264ea715ed0cb4d62def5667 Mon Sep 17 00:00:00 2001
From: Hugo Trippaers <htrippaers@schubergphilis.com>
Date: Mon, 24 Feb 2014 14:07:33 +0100
Subject: [PATCH] Findbugs: Fix potential NPE

---
 .../cloud/hypervisor/kvm/resource/KVMHABase.java    | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHABase.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHABase.java
index fdaaeb31c45..b829f78f625 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHABase.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHABase.java
@@ -48,11 +48,11 @@ public class KVMHABase {
         PoolType _type;
 
         public NfsStoragePool(String poolUUID, String poolIp, String poolSourcePath, String mountDestPath, PoolType type) {
-            this._poolUUID = poolUUID;
-            this._poolIp = poolIp;
-            this._poolMountSourcePath = poolSourcePath;
-            this._mountDestPath = mountDestPath;
-            this._type = type;
+            _poolUUID = poolUUID;
+            _poolIp = poolIp;
+            _poolMountSourcePath = poolSourcePath;
+            _mountDestPath = mountDestPath;
+            _type = type;
         }
     }
 
@@ -115,8 +115,9 @@ public class KVMHABase {
                      * the storage pool still running
                      */
                 }
+                poolName = pool.getName();
             }
-            poolName = pool.getName();
+
         } catch (LibvirtException e) {
             s_logger.debug("Ignoring libvirt error.", e);
         } finally {