cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alena1...@apache.org
Subject git commit: updated refs/heads/master to 63b8199
Date Fri, 11 Jul 2014 23:03:28 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master a6b42fde5 -> 63b81995f


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/master
Commit: 63b81995f6f85238866fc388d04b16955354099d
Parents: a6b42fd
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Authored: Fri Jul 11 16:01:34 2014 -0700
Committer: Alena Prokharchyk <alena.prokharchyk@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;
         }
 


Mime
View raw message