CLOUDSTACK-1624: Initialize configuration variables properly to avoid influence of any racing conditions
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/85198980 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/85198980 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/85198980 Branch: refs/heads/4.1 Commit: 85198980ca4c6947bbba760a304bf4bbf726b551 Parents: 8a99fb3 Author: Kelven Yang <[email protected]> Authored: Tue Mar 12 14:56:35 2013 -0700 Committer: Kelven Yang <[email protected]> Committed: Tue Mar 12 14:56:35 2013 -0700 ---------------------------------------------------------------------- .../configuration/ConfigurationManagerImpl.java | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/85198980/server/src/com/cloud/configuration/ConfigurationManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java index da5f99e..52ea8e2 100755 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -252,17 +252,19 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati // FIXME - why don't we have interface for DataCenterLinkLocalIpAddressDao? @Inject protected DataCenterLinkLocalIpAddressDao _LinkLocalIpAllocDao; - private int _maxVolumeSizeInGb; - private long _defaultPageSize; + private int _maxVolumeSizeInGb = Integer.parseInt(Config.MaxVolumeSize.getDefaultValue()); + private long _defaultPageSize = Long.parseLong(Config.DefaultPageSize.getDefaultValue()); protected Set<String> configValuesForValidation; @Override public boolean configure(final String name, final Map<String, Object> params) throws ConfigurationException { - String maxVolumeSizeInGbString = _configDao.getValue("storage.max.volume.size"); - _maxVolumeSizeInGb = NumbersUtil.parseInt(maxVolumeSizeInGbString, 2000); + String maxVolumeSizeInGbString = _configDao.getValue(Config.MaxVolumeSize.key()); + _maxVolumeSizeInGb = NumbersUtil.parseInt(maxVolumeSizeInGbString, + Integer.parseInt(Config.MaxVolumeSize.getDefaultValue())); - String defaultPageSizeString = _configDao.getValue("default.page.size"); - _defaultPageSize = NumbersUtil.parseLong(defaultPageSizeString, 500L); + String defaultPageSizeString = _configDao.getValue(Config.DefaultPageSize.key()); + _defaultPageSize = NumbersUtil.parseLong(defaultPageSizeString, + Long.parseLong(Config.DefaultPageSize.getDefaultValue())); populateConfigValuesForValidationSet(); return true;
