You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by fr...@apache.org on 2013/07/30 00:20:28 UTC
git commit: updated refs/heads/master to 2d5f24c
Updated Branches:
refs/heads/master a917cbefc -> 2d5f24ceb
CLOUDSTACK-3918
com.cloud.ucs.manager.UcsManagerImpl cannot parse default config
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2d5f24ce
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2d5f24ce
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2d5f24ce
Branch: refs/heads/master
Commit: 2d5f24ceb185c91cbe8b86a0d9a59eb0a4595f1d
Parents: a917cbe
Author: frank <fr...@citrix.com>
Authored: Mon Jul 29 15:28:53 2013 -0700
Committer: frank <fr...@citrix.com>
Committed: Mon Jul 29 15:30:09 2013 -0700
----------------------------------------------------------------------
.../ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2d5f24ce/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java
index df874cb..fdc09d3 100755
--- a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java
+++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java
@@ -175,7 +175,11 @@ public class UcsManagerImpl implements UcsManager {
@Override
public boolean start() {
- syncBladeInterval = Integer.valueOf(configDao.getValue(Config.UCSSyncBladeInterval.key()));
+ try {
+ syncBladeInterval = Integer.valueOf(configDao.getValue(Config.UCSSyncBladeInterval.key()));
+ } catch (NumberFormatException e) {
+ syncBladeInterval = 600;
+ }
syncBladesExecutor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("UCS-SyncBlades"));
syncBladesExecutor.scheduleAtFixedRate(new SyncBladesThread(), syncBladeInterval, syncBladeInterval, TimeUnit.SECONDS);
return true;