diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-10-05 19:03:17 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2022-10-05 19:03:17 +0200 |
commit | ac3c06b6b5b6de6d0457462f72557feb937760bd (patch) | |
tree | fdaae239b3fdfe693e6773bfafba3928c8adfb21 /container-core | |
parent | 5880c873977829385421eb32e3187e72ccc02cd5 (diff) |
Simplify
Diffstat (limited to 'container-core')
-rw-r--r-- | container-core/src/main/java/com/yahoo/container/jdisc/HttpRequest.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/HttpRequest.java b/container-core/src/main/java/com/yahoo/container/jdisc/HttpRequest.java index cded4f36d54..d5ac3a9a124 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/HttpRequest.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/HttpRequest.java @@ -21,6 +21,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Optional; import static com.yahoo.jdisc.http.HttpRequest.Method; @@ -54,7 +55,7 @@ public class HttpRequest { InputStream requestData = null; URI uri = null; CurrentContainer container = null; - private final String nag = " must be set before the attempted operation."; + private static final String nag = " must be set before the attempted operation."; SocketAddress remoteAddress; private void boom(Object ref, String what) { @@ -410,11 +411,7 @@ public class HttpRequest { Map<String, String> mask; Map<String, String> view; - if (parameterMask != null) { - mask = parameterMask; - } else { - mask = Collections.emptyMap(); - } + mask = Objects.requireNonNullElse(parameterMask, Collections.emptyMap()); view = new HashMap<>(parameters.size() + mask.size()); for (Map.Entry<String, List<String>> parameter : parameters.entrySet()) { if (existsAsOriginalParameter(parameter.getValue())) { |