Repository: cloudstack Updated Branches: refs/heads/master 48574f2d6 -> b2d613f53
CLOUDSTACK-6242: catching all to allow continuation on configuration error (CLOUDSTACK-7039 through CLOUDSTACK-7042) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b2d613f5 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b2d613f5 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b2d613f5 Branch: refs/heads/master Commit: b2d613f53625f0dba101fa27a8a3cbdd5183740f Parents: 48574f2 Author: Daan Hoogland <[email protected]> Authored: Thu Jul 3 08:41:47 2014 +0200 Committer: Daan Hoogland <[email protected]> Committed: Thu Jul 3 08:41:47 2014 +0200 ---------------------------------------------------------------------- server/src/com/cloud/server/ConfigurationServerImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b2d613f5/server/src/com/cloud/server/ConfigurationServerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java index 1469048..b66e52d 100755 --- a/server/src/com/cloud/server/ConfigurationServerImpl.java +++ b/server/src/com/cloud/server/ConfigurationServerImpl.java @@ -512,9 +512,9 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio PreparedStatement stmt = txn.prepareAutoCloseStatement(checkSql); stmt.executeQuery(); tableName = "network_group"; - } catch (SQLException ex) { + } catch (Exception ex) { // if network_groups table exists, create the default security group there - s_logger.debug("Caught SQLException: no network_group ", ex); + s_logger.debug("Caught (SQL?)Exception: no network_group " + ex.getLocalizedMessage()); } insertSql = "SELECT * FROM " + tableName + " where account_id=2 and name='default'";
