Fixing conflict of -nodeConfig and -hub options
@@ -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;
