Commit 0b4a5d71 authored by Derek DeMoro's avatar Derek DeMoro Committed by derek

Add check for messenger home relative to startup script.


git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@103 b35dd754-fafc-0310-a699-88a17e54d16e
parent 0842a17e
...@@ -713,6 +713,19 @@ public class JiveGlobals { ...@@ -713,6 +713,19 @@ public class JiveGlobals {
if (messengerHome == null) { if (messengerHome == null) {
messengerHome = System.getProperty("messengerHome"); messengerHome = System.getProperty("messengerHome");
} }
if(messengerHome == null){
try {
messengerHome = new File("..").getCanonicalPath();
if(!new File(messengerHome, "conf/jive-messenger.xml").exists()){
messengerHome = null;
}
}
catch (IOException e) {
e.printStackTrace();
}
}
// If still null, finding messengerHome failed. // If still null, finding messengerHome failed.
if (messengerHome == null) { if (messengerHome == null) {
failedLoading = true; failedLoading = true;
......
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