From 08b9a96b7c19b94da8b6f934d579a5e0d30f44bf Mon Sep 17 00:00:00 2001
From: Daan Hoogland <daan@onecht.net>
Date: Thu, 2 Oct 2014 11:12:55 +0200
Subject: [PATCH] CLOUDSTACK-7219 added nullcheck to config retrieval

---
 server/src/com/cloud/server/ManagementServerImpl.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index da72711b34f..0711fed47a3 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -1703,9 +1703,11 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
             List<ConfigurationVO> configVOList = new ArrayList<ConfigurationVO>();
             for (ConfigurationVO param : result.first()) {
                 ConfigurationVO configVo = _configDao.findByName(param.getName());
-                configVo.setValue(_configDepot.get(param.getName()).valueIn(id).toString());
-                configVOList.add(configVo);
-    }
+                if (configVo != null) {
+                    configVo.setValue(_configDepot.get(param.getName()).valueIn(id).toString());
+                    configVOList.add(configVo);
+                }
+            }
 
             return new Pair<List<? extends Configuration>, Integer>(configVOList, configVOList.size());
         }