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/07/14 15:37:43 UTC
[39/44] git commit: updated refs/heads/vpc-toolkit-hugo to 1ad1883
CLOUDSTACK-7100: update global config - trim leading and trailing whitespaces before global config value update
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/63b81995
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/63b81995
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/63b81995
Branch: refs/heads/vpc-toolkit-hugo
Commit: 63b81995f6f85238866fc388d04b16955354099d
Parents: a6b42fd
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Fri Jul 11 16:01:34 2014 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Fri Jul 11 16:02:51 2014 -0700
----------------------------------------------------------------------
.../src/com/cloud/configuration/ConfigurationManagerImpl.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/63b81995/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 897f8e1..1940f48 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -432,7 +432,6 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
@Override
@DB
public String updateConfiguration(long userId, String name, String category, String value, String scope, Long resourceId) {
-
String validationMsg = validateConfigurationValue(name, value, scope);
if (validationMsg != null) {
@@ -653,7 +652,9 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
return _configDao.findByName(name);
}
- if (value.trim().isEmpty() || value.equals("null")) {
+ value = value.trim();
+
+ if (value.isEmpty() || value.equals("null")) {
value = null;
}