Commit cd4ac295 authored by Jean Meurice's avatar Jean Meurice

autopilots->softwares rename fix

parent 743eee97
Pipeline #218222 passed with stage
in 3 minutes and 31 seconds
...@@ -59,9 +59,9 @@ public class RMIServer { ...@@ -59,9 +59,9 @@ public class RMIServer {
return; return;
} }
File autopilot_folder = new File(options.containsKey("autopilots_folder") ? options.get("autopilots_folder") : "autopilots"); File softwares_folder = new File(options.containsKey("softwares_folder") ? options.get("softwares_folder") : "autopilots");
if (!autopilot_folder.exists()){ if (!softwares_folder.exists()){
System.out.printf("The autopilot folder %s does not exist\n", autopilot_folder); System.out.printf("The autopilot folder %s does not exist\n", softwares_folder);
return; return;
} }
...@@ -71,10 +71,10 @@ public class RMIServer { ...@@ -71,10 +71,10 @@ public class RMIServer {
SoftwareSimulatorConfig manager_config = new SoftwareSimulatorConfig(); SoftwareSimulatorConfig manager_config = new SoftwareSimulatorConfig();
try {// Load AutopilotAdapter.dll from libraryPath 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) { } catch (IOException e) {
e.printStackTrace(); 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); 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