Commit 23b5bc52 authored by Locatelli's avatar Locatelli
Browse files

Merge remote-tracking branch 'origin/V4.0' into ploty2

parents d539a617 3639c498
4.0.1 16/04/2020
-----
* Correctly set nomadServerEndPoint when running in remote mode
4.0.0 4.0.0
----- -----
* Remote control management * Remote control management
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>fr.ill.ics</groupId> <groupId>fr.ill.ics</groupId>
<artifactId>nomadcommandsystem</artifactId> <artifactId>nomadcommandsystem</artifactId>
<version>4.0.0</version> <version>4.0.1</version>
<name>NomadCommandSystem</name> <name>NomadCommandSystem</name>
<description>Java bridge for the communication with the Nomad server</description> <description>Java bridge for the communication with the Nomad server</description>
<scm> <scm>
......
...@@ -7,6 +7,7 @@ import fr.ill.ics.cameo.Application; ...@@ -7,6 +7,7 @@ import fr.ill.ics.cameo.Application;
import fr.ill.ics.cameo.Application.Instance; import fr.ill.ics.cameo.Application.Instance;
import fr.ill.ics.cameo.ConnectionTimeout; import fr.ill.ics.cameo.ConnectionTimeout;
import fr.ill.ics.cameo.Server; import fr.ill.ics.cameo.Server;
import fr.ill.ics.nscclient.sessionmanagement.SessionManager;
import fr.ill.ics.util.ConfigManager; import fr.ill.ics.util.ConfigManager;
/** /**
...@@ -33,8 +34,7 @@ public class ServerInstance { ...@@ -33,8 +34,7 @@ public class ServerInstance {
nomadServerEndpoint = ConfigManager.getInstance().getNomadServerEndpoint(); nomadServerEndpoint = ConfigManager.getInstance().getNomadServerEndpoint();
} else { } else {
// nomad endpoint is build from selected instrument // nomad endpoint is build from selected instrument
//nomadServerEndpoint = return "tcp://" + SessionManager.getInstance(CommandZoneWrapper.SERVER_ID).getInstrumentName() + ":7000"; nomadServerEndpoint = "tcp://" + SessionManager.getInstance(CommandZoneWrapper.SERVER_ID).getInstrumentName() + ":7000";
nomadServerEndpoint = "tcp://localhost:7000";
} }
// Connect to the server. // Connect to the server.
......
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