diff options
author | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-03-03 12:52:51 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-03-03 12:52:51 +0100 |
commit | ca866e60ef9c61b0725676a48514d5be44ab0266 (patch) | |
tree | 837005277449b36f41439e873b10f82d9bb9e8b4 | |
parent | eda3c75258874f160132189d27dc6028318b4db1 (diff) |
Nonfunctional changes
2 files changed, 2 insertions, 1 deletions
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/SecurityResponseFilterChain.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/SecurityResponseFilterChain.java index 6ac68cee894..ae4ea34e45c 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/SecurityResponseFilterChain.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/SecurityResponseFilterChain.java @@ -84,6 +84,7 @@ public class SecurityResponseFilterChain extends AbstractResource implements Res public URI getUri() { return request.getUri(); } + } } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java index fbff0115192..d5c32286cc5 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java @@ -40,7 +40,7 @@ public class CapacityPolicies { public Flavor decideFlavor(Capacity requestedCapacity, ClusterSpec cluster, Optional<String> defaultFlavorOverride) { // for now, always use requested docker flavor when requested - final Optional<String> requestedFlavor = requestedCapacity.flavor(); + Optional<String> requestedFlavor = requestedCapacity.flavor(); if (requestedFlavor.isPresent() && flavors.getFlavorOrThrow(requestedFlavor.get()).getType() == Flavor.Type.DOCKER_CONTAINER) return flavors.getFlavorOrThrow(requestedFlavor.get()); |