diff options
author | Jon Bratseth <bratseth@oath.com> | 2018-05-28 11:01:36 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@oath.com> | 2018-05-28 11:01:36 +0200 |
commit | 45779f7073a2832c411692af90432a29bd966083 (patch) | |
tree | 5bfbcf5e37c207444025f512bacdf70b7ccea4cb /config-model/src | |
parent | b299a201c4ffa1c22476f93a08288d1abb97f744 (diff) | |
parent | e7203cce8fa1092c501784cd50d3e559ff2f0020 (diff) |
Merge branch 'master' into bratseth/better-error-message
Diffstat (limited to 'config-model/src')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/content/DistributorCluster.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/DistributorCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/DistributorCluster.java index e60aabd24e8..659a07cfd5c 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/DistributorCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/DistributorCluster.java @@ -60,7 +60,7 @@ public class DistributorCluster extends AbstractConfigProducer<Distributor> impl return s.toString(); } - private int getGCInterval(ModelElement documentNode) throws ParseException { + private int getGCInterval(ModelElement documentNode) { int gcInterval = 3600; if (documentNode != null) { gcInterval = documentNode.getIntegerAttribute("garbage-collection-interval", gcInterval); |