Commit 88419619 authored by Evgeny Kusmenko's avatar Evgeny Kusmenko

Merge branch 'fix' into 'master'

autopilots->softwares rename fix

See merge request !13
parents 743eee97 9a21fe4c
Pipeline #218240 failed with stages
in 2 minutes and 37 seconds
......@@ -59,9 +59,9 @@ public class RMIServer {
return;
}
File autopilot_folder = new File(options.containsKey("autopilots_folder") ? options.get("autopilots_folder") : "autopilots");
if (!autopilot_folder.exists()){
System.out.printf("The autopilot folder %s does not exist\n", autopilot_folder);
File softwares_folder = new File(options.containsKey("softwares_folder") ? options.get("softwares_folder") : "autopilots");
if (!softwares_folder.exists()){
System.out.printf("The autopilot folder %s does not exist\n", softwares_folder);
return;
}
......@@ -71,10 +71,10 @@ public class RMIServer {
SoftwareSimulatorConfig manager_config = new SoftwareSimulatorConfig();
try {// Load AutopilotAdapter.dll from libraryPath
manager_config.set_softwares_folder(autopilot_folder.getCanonicalPath());
manager_config.set_softwares_folder(softwares_folder.getCanonicalPath());
} catch (IOException e) {
e.printStackTrace();
System.out.println("Could not resolve the SoftwareSimulator's software folder path. ("+autopilot_folder+")");
System.out.println("Could not resolve the SoftwareSimulator's software folder path. ("+softwares_folder+")");
}
int port_id = Integer.valueOf(port);
......
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