From b2d613f53625f0dba101fa27a8a3cbdd5183740f Mon Sep 17 00:00:00 2001
From: Daan Hoogland <daan@onecht.net>
Date: Thu, 3 Jul 2014 08:41:47 +0200
Subject: [PATCH] CLOUDSTACK-6242: catching all to allow continuation on
 configuration error (CLOUDSTACK-7039 through CLOUDSTACK-7042)

---
 server/src/com/cloud/server/ConfigurationServerImpl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java
index 14690480264..b66e52dcb09 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'";