mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2025-10-29 03:34:43 +00:00
Code Issues Projects Releases Wiki Activity

SPARK-2350: MainWindow: avoid NPE when running from IDE and attempt to restart

Browse Source
This commit is contained in:
Sergey Ponomarev 2025-07-26 10:04:11 +03:00 committed by Guus der Kinderen
parent fae3cf7e4b
commit 8856e6dd3b
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/src/main/java/org/jivesoftware/MainWindow.java
View File

@ -348,27 +348,35 @@ public final class MainWindow extends ChatFrame implements ActionListener {
return classpath.toString();
}
private String getCommandPath() throws IOException{
return getLibDirectory().getParentFile().getCanonicalPath();
private String getCommandPath() throws IOException{
File libDir = getLibDirectory();
if (libDir == null) {
return null;
}
return libDir.getParentFile().getCanonicalPath();
}
public boolean restartApplicationWithScript() {
String command = null;
try {
String commandPath = getCommandPath();
if (commandPath == null) {
return false;
}
if (Spark.isWindows()) {
String sparkExe = getCommandPath() + File.separator + Default.getString(Default.SHORT_NAME) + ".exe";
String sparkExe = commandPath + File.separator + Default.getString(Default.SHORT_NAME) + ".exe";
if (!new File(sparkExe).exists()) {
Log.warning("Client EXE file does not exist");
return false;
}
String starterExe = getCommandPath() + File.separator + "starter.exe";
String starterExe = commandPath + File.separator + "starter.exe";
if (!new File(starterExe).exists()) {
Log.warning("Starter EXE file does not exist");
return false;
}
command = starterExe + " \"" + sparkExe + "\"";
command = starterExe + " \"" + sparkExe + "\"";
} else if (Spark.isLinux()) {
command = getCommandPath() + File.separator + Default.getString(Default.SHORT_NAME);
command = commandPath + File.separator + Default.getString(Default.SHORT_NAME);
if (!new File(command).exists()) {
Log.warning("Client startup script does not exist");
return false;