Commit a793974c authored by Derek DeMoro's avatar Derek DeMoro Committed by derek

Fixed messengerHome issue with web applications.


git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@180 b35dd754-fafc-0310-a699-88a17e54d16e
parent 0080182b
......@@ -253,6 +253,7 @@ public abstract class BootstrapContainer implements Container, ServiceLookupProv
this.modules.add(mod);
}
catch (Exception e) {
e.printStackTrace();
if (isInitialized) {
mod.stop();
mod.destroy();
......@@ -499,20 +500,24 @@ public abstract class BootstrapContainer implements Container, ServiceLookupProv
* @throws FileNotFoundException if there was a problem with the home
* directory provided
*/
private File verifyHome(String homeGuess, String jiveConfigName) throws
FileNotFoundException {
String forumsConfigName = "jive_config.xml";
private File verifyHome(String homeGuess, String jiveConfigName) throws FileNotFoundException {
File realHome = null;
File guess = new File(homeGuess);
File configFileGuess = new File(guess, jiveConfigName);
if (configFileGuess.exists()) {
realHome = guess;
}
File forumsHome = new File(guess, forumsConfigName);
if (forumsHome.exists()) {
File forumsHome = new File(guess, jiveConfigName);
if (!forumsHome.exists()) {
throw new FileNotFoundException();
}
try{
return new File(realHome.getCanonicalPath());
}
catch(Exception ex){
throw new FileNotFoundException();
}
return realHome;
}
/**
......
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