cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mlsoren...@apache.org
Subject [04/32] git commit: updated refs/heads/resize-root to c02c634
Date Sat, 15 Mar 2014 05:38:35 GMT
CLOUDSTACK-6238: NPE in HostStatsCollector.


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

Branch: refs/heads/resize-root
Commit: 6a5d3e96c96c0cd5ec9e1ec1e1c4ed42dc73f84f
Parents: 2869744
Author: Sanjay Tripathi <sanjay.tripathi@citrix.com>
Authored: Fri Mar 14 13:35:22 2014 +0530
Committer: Sanjay Tripathi <sanjay.tripathi@citrix.com>
Committed: Fri Mar 14 13:37:19 2014 +0530

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a5d3e96/server/src/com/cloud/server/StatsCollector.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/StatsCollector.java b/server/src/com/cloud/server/StatsCollector.java
index 067ed00..50aa93c 100755
--- a/server/src/com/cloud/server/StatsCollector.java
+++ b/server/src/com/cloud/server/StatsCollector.java
@@ -343,7 +343,9 @@ public class StatsCollector extends ManagerBase implements ComponentMethodInterc
                 }
                 for (HostVO host : gpuEnabledHosts) {
                     HashMap<String, HashMap<String, Long>> groupDetails = _resourceMgr.getGPUStatistics(host);
-                    _resourceMgr.updateGPUDetails(host.getId(), groupDetails);
+                    if (groupDetails != null) {
+                        _resourceMgr.updateGPUDetails(host.getId(), groupDetails);
+                    }
                 }
                 hostIds = _hostGpuGroupsDao.listHostIds();
             } catch (Throwable t) {


Mime
View raw message