Fixing conflict of -nodeConfig and -hub options

barancev · barancev · commit 8828d594428c · 2018-02-07T13:38:33.000+03:00
diff --git a/java/server/src/org/openqa/grid/internal/utils/configuration/GridNodeConfiguration.java b/java/server/src/org/openqa/grid/internal/utils/configuration/GridNodeConfiguration.java
@@ -394,8 +394,8 @@ public void merge(GridNodeConfiguration other) {
     if (isMergeAble(other.downPollingLimit, downPollingLimit)) {
       downPollingLimit = other.downPollingLimit;
     }
-    if (isMergeAble(other.hub, hub)) {
-      hub = other.hub;
+    if (isMergeAble(other.hubOption, hubOption)) {
+      hubOption = other.hubOption;
     }
     if (isMergeAble(other.hubHost, hubHost)) {
       hubHost = other.hubHost;

Original file line number	Diff line number	Diff line change
`@@ -394,8 +394,8 @@ public void merge(GridNodeConfiguration other) {`
`394`	`394`	`if (isMergeAble(other.downPollingLimit, downPollingLimit)) {`
`395`	`395`	`downPollingLimit = other.downPollingLimit;`
`396`	`396`	`}`
`397`		`- if (isMergeAble(other.hub, hub)) {`
`398`		`- hub = other.hub;`
	`397`	`+ if (isMergeAble(other.hubOption, hubOption)) {`
	`398`	`+ hubOption = other.hubOption;`
`399`	`399`	`}`
`400`	`400`	`if (isMergeAble(other.hubHost, hubHost)) {`
`401`	`401`	`hubHost = other.hubHost;`