cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dar...@apache.org
Subject git commit: updated refs/heads/master to 19ef999
Date Mon, 30 Sep 2013 17:08:07 GMT
Updated Branches:
  refs/heads/master cba8e40e4 -> 19ef999e3


Wrong field was used in check


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/19ef999e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/19ef999e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/19ef999e

Branch: refs/heads/master
Commit: 19ef999e36c07e113c19154731661ba47a0af169
Parents: cba8e40
Author: Darren Shepherd <darren.s.shepherd@gmail.com>
Authored: Mon Sep 30 10:07:28 2013 -0700
Committer: Darren Shepherd <darren.s.shepherd@gmail.com>
Committed: Mon Sep 30 10:07:28 2013 -0700

----------------------------------------------------------------------
 .../apache/cloudstack/framework/config/impl/ConfigDepotImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/19ef999e/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 97430ef..11281bf 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
@@ -97,7 +97,7 @@ public class ConfigDepotImpl implements ConfigDepot, ConfigDepotAdmin, SystemInt
                     _configDao.persist(vo);
                 } else {
                     if (vo.isDynamic() != key.isDynamic() ||
-                        !ObjectUtils.equals(vo.getDescription(), vo.getDescription()) ||
+                        !ObjectUtils.equals(vo.getDescription(), key.description()) ||
                         !ObjectUtils.equals(vo.getDefaultValue(), key.defaultValue())) {
                         vo.setDynamic(key.isDynamic());
                         vo.setDescription(key.description());


Mime
View raw message