Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Instrument Control
NomadCommandSystem
Commits
643d2d0b
Commit
643d2d0b
authored
Apr 16, 2020
by
helene ortiz
Browse files
Correctly set nomadServerEndPoint when running in remote mode
parent
fce42683
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/main/java/fr/ill/ics/nscclient/serverconnection/ServerInstance.java
View file @
643d2d0b
...
...
@@ -7,6 +7,7 @@ import fr.ill.ics.cameo.Application;
import
fr.ill.ics.cameo.Application.Instance
;
import
fr.ill.ics.cameo.ConnectionTimeout
;
import
fr.ill.ics.cameo.Server
;
import
fr.ill.ics.nscclient.sessionmanagement.SessionManager
;
import
fr.ill.ics.util.ConfigManager
;
/**
...
...
@@ -33,8 +34,7 @@ public class ServerInstance {
nomadServerEndpoint
=
ConfigManager
.
getInstance
().
getNomadServerEndpoint
();
}
else
{
// nomad endpoint is build from selected instrument
//nomadServerEndpoint = return "tcp://" + SessionManager.getInstance(CommandZoneWrapper.SERVER_ID).getInstrumentName() + ":7000";
nomadServerEndpoint
=
"tcp://localhost:7000"
;
nomadServerEndpoint
=
"tcp://"
+
SessionManager
.
getInstance
(
CommandZoneWrapper
.
SERVER_ID
).
getInstrumentName
()
+
":7000"
;
}
// Connect to the server.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment