An error is (back again) displayed during setup if no connection to the database was found.

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@10494 b35dd754-fafc-0310-a699-88a17e54d16e

src/web/setup/setup-datasource-standard.jsp

@@ -44,11 +44,6 @@
         try {
             con = DbConnectionManager.getConnection();
             if (con == null) {
-                success = false;
-                errors.put("general","A connection to the database could not be "
-                    + "made. View the error message by opening the "
-                    + "\"" + File.separator + "logs" + File.separator + "error.log\" log "
-                    + "file, then go back to fix the problem.");
             }
             else {
             	// See if the Jive db schema is installed.
@@ -67,7 +62,14 @@
             	}
             }
         }
-        catch (Exception ignored) {}
+        catch (SQLException ex) {
+            success = false;
+            errors.put("general","A connection to the database could not be "
+                + "made. View the error message by opening the "
+                + "\"" + File.separator + "logs" + File.separator + "error.log\" log "
+                + "file, then go back to fix the problem.");
+
+        }
         finally {
             try {
         	    con.close();