| commit | b9a2d664516802670b6396418a78f3b63dca2661 | [log] [tgz] |
|---|---|---|
| author | David Pursehouse <dpursehouse@collab.net> | Fri Nov 24 15:54:19 2017 +0900 |
| committer | David Pursehouse <dpursehouse@collab.net> | Fri Nov 24 15:55:49 2017 +0900 |
| tree | 761a9764fa48ca0dc8cf766c3b45e3c4f282bad3 | |
| parent | 31d29f8047782fd4b57c2c3648e822bd5242e063 [diff] | |
| parent | fea8d39afb227709065839dab812eb27ae87f9c4 [diff] |
Merge branch 'stable-2.13' into stable-2.14 * stable-2.13: Fix usage of DEFAULT_SKIP_INTERFACE_LIST Change-Id: I0988ff97618178cc8299783decc44b929b6ded3c
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/Configuration.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/Configuration.java index abe267f..3e87d01 100644 --- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/Configuration.java +++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/Configuration.java
@@ -276,7 +276,7 @@ private JGroups(Config cfg) { String[] skip = cfg.getStringList(JGROUPS_SECTION, null, SKIP_INTERFACE_KEY); - skipInterface = skip == null ? DEFAULT_SKIP_INTERFACE_LIST : ImmutableList.copyOf(skip); + skipInterface = skip.length == 0 ? DEFAULT_SKIP_INTERFACE_LIST : ImmutableList.copyOf(skip); clusterName = getString(cfg, JGROUPS_SECTION, null, CLUSTER_NAME_KEY, DEFAULT_CLUSTER_NAME); }