Try to create a new connection pool if none was found and a new connection was requested. JM-1028

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

src/java/org/jivesoftware/database/DefaultConnectionProvider.java

@@ -65,11 +65,22 @@ public class DefaultConnectionProvider implements ConnectionProvider {
             synchronized (initLock) {
                 // if still null, something has gone wrong
                 if (connectionPool == null) {
-                    Log.error("Warning: DbConnectionDefaultPool.getConnection() was " +
-                            "called before the internal pool has been initialized.");
+                    Log.error("DbConnectionDefaultPool.getConnection() was " +
+                    "called before the internal pool has been initialized or " +
+                    "there was a problem connecting to the database.");
+                    // Attempt to connect again if setup was already done
+                    if ("true".equals(JiveGlobals.getXMLProperty("setup"))) {
+                        this.restart();
+                        if (connectionPool == null) {
+                            Log.error("Recovery logic failed to reconnect to the database.");
                             return null;
                         }
                     }
+                    else {
+                        return null;
+                    }
+                }
+            }
         }
 
         return connectionPool.getConnection();