Commit 46fde7d7 authored by Gabriel Guardincerri's avatar Gabriel Guardincerri Committed by gguardin

Roll back last change, since it makes trunk crash

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@10541 b35dd754-fafc-0310-a699-88a17e54d16e
parent db7c295e
......@@ -788,24 +788,7 @@ public class JiveGlobals {
* @return true if in setup mode.
*/
private static boolean isSetupMode() {
if (Boolean.valueOf(JiveGlobals.getXMLProperty("setup"))) {
return false;
}
// Check if the DB configuration is done
Connection con = null;
PreparedStatement pstmt = null;
try {
con = DbConnectionManager.getConnection();
// Properties can now be loaded from DB so consider setup done
}
catch (SQLException e) {
// Properties cannot be loaded from DB so do not consider setup done
return true;
}
finally {
DbConnectionManager.closeConnection(pstmt, con);
}
return false;
return !Boolean.valueOf(JiveGlobals.getXMLProperty("setup"));
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment