Repository: cloudstack Updated Branches: refs/heads/master ffbcd2910 -> 5d389b1a7
CLOUDSTACK-5992: default values of configuraiton parameters in configuration table are set NULL on fresh setup Some configuration parameters have Component names different from fresh and upgrade setup Signed-off-by: Rajani Karuturi <rajanikarut...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5d389b1a Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5d389b1a Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5d389b1a Branch: refs/heads/master Commit: 5d389b1a711bff0a2c7959a824e28d54b56f9e89 Parents: ffbcd29 Author: Harikrishna Patnala <harikrishna.patn...@citrix.com> Authored: Thu Jan 30 17:14:27 2014 +0530 Committer: Rajani Karuturi <rajanikarut...@gmail.com> Committed: Fri Sep 5 14:59:33 2014 +0530 ---------------------------------------------------------------------- .../cloudstack/framework/config/impl/ConfigDepotImpl.java | 6 ++++-- server/src/com/cloud/server/ConfigurationServerImpl.java | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5d389b1a/framework/config/src/org/apache/cloudstack/framework/config/impl/ConfigDepotImpl.java ---------------------------------------------------------------------- diff --git a/framework/config/src/org/apache/cloudstack/framework/config/impl/ConfigDepotImpl.java b/framework/config/src/org/apache/cloudstack/framework/config/impl/ConfigDepotImpl.java index c1ab6b8..4631bb9 100644 --- a/framework/config/src/org/apache/cloudstack/framework/config/impl/ConfigDepotImpl.java +++ b/framework/config/src/org/apache/cloudstack/framework/config/impl/ConfigDepotImpl.java @@ -136,12 +136,14 @@ public class ConfigDepotImpl implements ConfigDepot, ConfigDepotAdmin { } _configDao.persist(vo); } else { - if (vo.isDynamic() != key.isDynamic() || !ObjectUtils.equals(vo.getDescription(), key.description()) || !ObjectUtils.equals(vo.getDefaultValue(), key.defaultValue()) - || !ObjectUtils.equals(vo.getScope(), key.scope().toString())) { + if (vo.isDynamic() != key.isDynamic() || !ObjectUtils.equals(vo.getDescription(), key.description()) || !ObjectUtils.equals(vo.getDefaultValue(), key.defaultValue()) || + !ObjectUtils.equals(vo.getScope(), key.scope().toString()) || + !ObjectUtils.equals(vo.getComponent(), componentName)) { vo.setDynamic(key.isDynamic()); vo.setDescription(key.description()); vo.setDefaultValue(key.defaultValue()); vo.setScope(key.scope().toString()); + vo.setComponent(componentName); vo.setUpdated(date); _configDao.persist(vo); } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5d389b1a/server/src/com/cloud/server/ConfigurationServerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java index cb5956a..990f2ff 100755 --- a/server/src/com/cloud/server/ConfigurationServerImpl.java +++ b/server/src/com/cloud/server/ConfigurationServerImpl.java @@ -206,6 +206,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio value = ("Hidden".equals(category) || "Secure".equals(category)) ? DBEncryptionUtil.encrypt(value) : value; String description = c.getDescription(); ConfigurationVO configVO = new ConfigurationVO(category, instance, component, name, value, description); + configVO.setDefaultValue(value); _configDao.persist(configVO); } }