From fbd1ad520352b6aaa861af2468f8914880a12032 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Wed, 6 Oct 2021 06:40:23 +0200 Subject: Attach context --- .../com/yahoo/container/jdisc/ThreadedRequestHandler.java | 2 +- .../yahoo/jdisc/http/server/jetty/FormPostRequestHandler.java | 2 +- .../http/server/jetty/ReferenceCountingRequestHandler.java | 11 ++++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) (limited to 'container-core/src') diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedRequestHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedRequestHandler.java index 446ee90c205..ea686b7b956 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedRequestHandler.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedRequestHandler.java @@ -174,7 +174,7 @@ public abstract class ThreadedRequestHandler extends AbstractRequestHandler { RequestTask(Request request, BufferedContentChannel content, ResponseHandler responseHandler) { this.request = request; - this.requestReference = request.refer(); + this.requestReference = request.refer(this); this.content = content; this.responseHandler = responseHandler; } diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/FormPostRequestHandler.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/FormPostRequestHandler.java index 57fb32f89f0..5ee4434fd84 100644 --- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/FormPostRequestHandler.java +++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/FormPostRequestHandler.java @@ -72,7 +72,7 @@ class FormPostRequestHandler extends AbstractRequestHandler implements ContentCh this.contentCharset = getCharsetByName(contentCharsetName); this.responseHandler = responseHandler; this.request = (HttpRequest) request; - this.requestReference = request.refer(); + this.requestReference = request.refer(this); return this; } diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ReferenceCountingRequestHandler.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ReferenceCountingRequestHandler.java index 71cca62ce9c..00f8fa5140a 100644 --- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ReferenceCountingRequestHandler.java +++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ReferenceCountingRequestHandler.java @@ -70,6 +70,11 @@ class ReferenceCountingRequestHandler implements DelegatedRequestHandler { return delegate.refer(); } + @Override + public ResourceReference refer(Object context) { + return delegate.refer(context); + } + @Override public void release() { delegate.release(); @@ -97,7 +102,7 @@ class ReferenceCountingRequestHandler implements DelegatedRequestHandler { Objects.requireNonNull(delegate, "delegate"); this.request = request; this.delegate = delegate; - this.requestReference = request.refer(); + this.requestReference = request.refer(this); } @Override @@ -143,7 +148,7 @@ class ReferenceCountingRequestHandler implements DelegatedRequestHandler { Objects.requireNonNull(delegate, "delegate"); this.request = request; this.delegate = delegate; - this.requestReference = request.refer(); + this.requestReference = request.refer(this); } @Override @@ -200,7 +205,7 @@ class ReferenceCountingRequestHandler implements DelegatedRequestHandler { public ReferenceCountingCompletionHandler(SharedResource request, CompletionHandler delegate) { this.delegate = delegate; - this.requestReference = request.refer(); + this.requestReference = request.refer(this); } @Override -- cgit v1.2.3