diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-12-06 16:26:18 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-06 16:26:18 +0100 |
commit | ffdbd053a2b57383b2d463e8050394776b14abdf (patch) | |
tree | 9503649129ad706f6fc1f21f9655de92dde2b33f | |
parent | 229c63d597a668884d58a2219247a7feded5a6c0 (diff) | |
parent | d1f1c0910980df6112778f6c0c7f0605bd5bbf05 (diff) |
Merge pull request #20379 from vespa-engine/bjorncs/fix
Allow getParentRequest() on parent type
3 files changed, 2 insertions, 10 deletions
diff --git a/container-core/abi-spec.json b/container-core/abi-spec.json index 6bee1f2b4fb..e4b97c3c968 100644 --- a/container-core/abi-spec.json +++ b/container-core/abi-spec.json @@ -2321,8 +2321,7 @@ "public" ], "methods": [ - "public void <init>(com.yahoo.jdisc.http.HttpRequest)", - "public com.yahoo.jdisc.http.HttpRequest getParentRequest()" + "public void <init>(com.yahoo.jdisc.http.HttpRequest)" ], "fields": [] }, diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/filter/DiscFilterRequest.java b/container-core/src/main/java/com/yahoo/jdisc/http/filter/DiscFilterRequest.java index 8ac2305f5df..2580b4a6ac0 100644 --- a/container-core/src/main/java/com/yahoo/jdisc/http/filter/DiscFilterRequest.java +++ b/container-core/src/main/java/com/yahoo/jdisc/http/filter/DiscFilterRequest.java @@ -73,7 +73,7 @@ public class DiscFilterRequest { */ @Deprecated(forRemoval = true, since = "7.511") public HttpRequest getParentRequest() { - throw new UnsupportedOperationException("getParentRequest is not supported for " + parent.getClass().getName()); + return parent; } /** diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/filter/JdiscFilterRequest.java b/container-core/src/main/java/com/yahoo/jdisc/http/filter/JdiscFilterRequest.java index aa4050dd963..74c3b8adc7d 100644 --- a/container-core/src/main/java/com/yahoo/jdisc/http/filter/JdiscFilterRequest.java +++ b/container-core/src/main/java/com/yahoo/jdisc/http/filter/JdiscFilterRequest.java @@ -10,15 +10,8 @@ import com.yahoo.jdisc.http.HttpRequest; @Deprecated(forRemoval = true, since = "7.511") public class JdiscFilterRequest extends DiscFilterRequest { - private final HttpRequest parent; - public JdiscFilterRequest(HttpRequest parent) { super(parent); - this.parent = parent; } - @SuppressWarnings("removal") - @Override - public HttpRequest getParentRequest() { return parent; } - } |