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.

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

FISH-7993 : ignoring JMS PORT #6510

Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ public class StartServerHelper {

private static final String PROPS_HZ_PORT_NAME = "HZ_LISTENER_PORT";

private static final String PROPS_JMS_PROVIDER_PORT = "JMS_PROVIDER_PORT";

public StartServerHelper(Logger logger0, boolean terse0,
ServerDirs serverDirs0, GFLauncher launcher0,
String masterPassword0) {
Expand Down Expand Up @@ -358,7 +360,9 @@ private String validateAdditionalPortsForConnection() {
host = addr.getHost();
Map<String, String> propsFromXMl = this.launcher.getSysPropsFromXml();
Set<Map.Entry<String, String>> setOfPorts = propsFromXMl.entrySet().stream()
.filter(e -> !e.getKey().contains(PROPS_HZ_PORT_NAME)
.filter(e -> !e.getKey().contains(PROPS_HZ_PORT_NAME)
// Ignore JMS as it might be set to REMOTE
&& !e.getKey().contains(PROPS_JMS_PROVIDER_PORT)
&& e.getKey().contains(PROPS_PORT_NAME)).collect(Collectors.toSet());
for (Map.Entry<String, String> e: setOfPorts) {
if(!NetUtils.isPortFree(host, Integer.parseInt(e.getValue()))) {
Expand Down