You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by hu...@apache.org on 2014/02/24 14:45:36 UTC

[2/2] git commit: updated refs/heads/master to 52c4f00

Findbugs: Fix potential NPE

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

Branch: refs/heads/master
Commit: 52c4f00b266eb4e7264ea715ed0cb4d62def5667
Parents: 6b61fd7
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Mon Feb 24 14:07:33 2014 +0100
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Mon Feb 24 14:07:33 2014 +0100

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/52c4f00b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHABase.java
----------------------------------------------------------------------
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 fdaaeb3..b829f78 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 {