You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ke...@apache.org on 2013/01/17 23:22:38 UTC

[3/3] git commit: System VM can start now with Spring bootstraped management server

Updated Branches:
  refs/heads/javelin cbb7ff1c3 -> 6d155416c


System VM can start now with Spring bootstraped management server


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

Branch: refs/heads/javelin
Commit: 6d155416c20df9551864794334a3c888b42dafe5
Parents: cbb7ff1
Author: Kelven Yang <ke...@gmail.com>
Authored: Thu Jan 17 14:22:14 2013 -0800
Committer: Kelven Yang <ke...@gmail.com>
Committed: Thu Jan 17 14:22:14 2013 -0800

----------------------------------------------------------------------
 .../cloud/configuration/dao/ConfigurationDao.java  |    2 +
 .../configuration/dao/ConfigurationDaoImpl.java    |    5 +
 .../com/cloud/resource/ResourceManagerImpl.java    | 4615 ++++++++-------
 .../com/cloud/server/ConfigurationServerImpl.java  |    3 +
 .../src/com/cloud/server/ManagementServerImpl.java |    4 +-
 .../resource/DummySecondaryStorageResource.java    |    5 +-
 .../secondary/SecondaryStorageDiscoverer.java      |    4 +
 .../cloud/utils/component/ComponentContext.java    |    3 +
 8 files changed, 2543 insertions(+), 2098 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6d155416/server/src/com/cloud/configuration/dao/ConfigurationDao.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/dao/ConfigurationDao.java b/server/src/com/cloud/configuration/dao/ConfigurationDao.java
index a52bf75..c86c024 100644
--- a/server/src/com/cloud/configuration/dao/ConfigurationDao.java
+++ b/server/src/com/cloud/configuration/dao/ConfigurationDao.java
@@ -63,4 +63,6 @@ public interface ConfigurationDao extends GenericDao<ConfigurationVO, String> {
     ConfigurationVO findByName(String name);
 
 	boolean update(String name, String category, String value);
+	
+	void invalidateCache();
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6d155416/server/src/com/cloud/configuration/dao/ConfigurationDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/dao/ConfigurationDaoImpl.java b/server/src/com/cloud/configuration/dao/ConfigurationDaoImpl.java
index f185e43..91cb29b 100644
--- a/server/src/com/cloud/configuration/dao/ConfigurationDaoImpl.java
+++ b/server/src/com/cloud/configuration/dao/ConfigurationDaoImpl.java
@@ -61,6 +61,11 @@ public class ConfigurationDaoImpl extends GenericDaoBase<ConfigurationVO, String
     public boolean isPremium() {
         return _premium;
     }
+    
+    @Override
+    public void invalidateCache() {
+    	_configs = null;
+    }
 
     @Override
     public Map<String, String> getConfiguration(String instance, Map<String, ? extends Object> params) {