Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing the loss of the hostname that is specified in a federated lf f… #1484

Merged
merged 1 commit into from
Nov 21, 2022
Merged

Fixing the loss of the hostname that is specified in a federated lf f… #1484

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions org.lflang/src/org/lflang/federated/generator/FedGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,13 @@ private void analyzeFederates(Reactor fedReactor) {
mainDef.setName(fedReactor.getName());
mainDef.setReactorClass(fedReactor);

// Make sure that if no federation RTI properties were given in the
// cmdline, then those specified in the lf file are not lost
if (federationRTIProperties.get("host").equals("localhost") &&
!fedReactor.getHost().getAddr().equals("localhost")) {
federationRTIProperties.put("host", fedReactor.getHost().getAddr());
}

// Since federates are always within the main (federated) reactor,
// create a list containing just that one containing instantiation.
// This will be used to look up parameter values.
Expand Down