From d503773b68f9f89a5607749e822c9dcbeba12dfc Mon Sep 17 00:00:00 2001
From: Jon Bratseth <bratseth@verizonmedia.com>
Date: Thu, 22 Aug 2019 15:00:08 +0200
Subject: Handle inherited variants with different dimensions

---
 .../com/yahoo/container/jdisc/HttpRequest.java     | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

(limited to 'container-core/src')

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 a5517ae401e..e02ae152b3f 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
@@ -128,21 +128,16 @@ public class HttpRequest {
         }
 
         private void populateProperties() {
-            if (parent == null) {
-                return;
-            }
+            if (parent == null) return;
 
             properties.putAll(parent.propertyMap());
         }
 
         /**
-         * Add a parameter to the request. Multi-value parameters are not
-         * supported.
+         * Add a parameter to the request. Multi-value parameters are not supported.
          *
-         * @param key
-         *            parameter name
-         * @param value
-         *            parameter value
+         * @param key parameter name
+         * @param value parameter value
          * @return this Builder instance
          */
         public Builder put(String key, String value) {
@@ -162,8 +157,7 @@ public class HttpRequest {
         /**
          * Set the HTTP method for the new request.
          *
-         * @param method
-         *            the HTTP method to use for the new request
+         * @param method the HTTP method to use for the new request
          * @return this Builder instance
          */
         public Builder method(Method method) {
@@ -174,8 +168,7 @@ public class HttpRequest {
         /**
          * Define the JDisc parent request.
          *
-         * @param request
-         *            a valid JDisc request for the current container
+         * @param request a valid JDisc request for the current container
          * @return this Builder instance
          */
         public Builder jdiscRequest(com.yahoo.jdisc.http.HttpRequest request) {
@@ -214,8 +207,7 @@ public class HttpRequest {
          * instance's JDisc request, but no properties will be propagated into
          * the original JDisc request.
          *
-         * @return a new HttpRequest instance reflecting the given request data
-         *         and parameters
+         * @return a new HttpRequest instance reflecting the given request data and parameters
          */
         public HttpRequest createDirectRequest() {
             ensureRequestData();
-- 
cgit v1.2.3