summaryrefslogtreecommitdiffstats
path: root/container-core/src/main/java/com/yahoo/container/jdisc
diff options
context:
space:
mode:
Diffstat (limited to 'container-core/src/main/java/com/yahoo/container/jdisc')
-rw-r--r--container-core/src/main/java/com/yahoo/container/jdisc/HttpResponse.java6
-rw-r--r--container-core/src/main/java/com/yahoo/container/jdisc/MetricConsumerFactory.java4
-rw-r--r--container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java1
3 files changed, 4 insertions, 7 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/HttpResponse.java b/container-core/src/main/java/com/yahoo/container/jdisc/HttpResponse.java
index dd03d72d97d..a6042c541c0 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/HttpResponse.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/HttpResponse.java
@@ -27,8 +27,6 @@ public abstract class HttpResponse {
private final Response parentResponse;
- private Request.RequestType requestType;
-
/**
* Creates a new HTTP response
*
@@ -126,12 +124,12 @@ public abstract class HttpResponse {
}
/** Sets the type classification of this request for metric collection purposes */
- public void setRequestType(Request.RequestType requestType) { this.requestType = requestType; }
+ public void setRequestType(Request.RequestType requestType) { parentResponse.setRequestType(requestType); }
/**
* Returns the type classification of this request for metric collection purposes, or null if not set.
* When not set, the request type will be "read" for GET requests and "write" for other request methods.
*/
- public Request.RequestType getRequestType() { return requestType; }
+ public Request.RequestType getRequestType() { return parentResponse.getRequestType(); }
}
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/MetricConsumerFactory.java b/container-core/src/main/java/com/yahoo/container/jdisc/MetricConsumerFactory.java
index d0cf07584e4..ecf120bfe44 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/MetricConsumerFactory.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/MetricConsumerFactory.java
@@ -4,8 +4,8 @@ package com.yahoo.container.jdisc;
import com.yahoo.jdisc.application.MetricConsumer;
/**
- * <p>This is the interface to implement if one wishes to configure a non-default <code>MetricConsumer</code>. Simply
- * add the implementing class as a component in your services.xml file.</p>
+ * This is the interface to implement if one wishes to configure a non-default <code>MetricConsumer</code>. Simply
+ * add the implementing class as a component in your services.xml file.
*
* @author Simon Thoresen Hult
*/
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java
index ac302d6215b..d729e2371c9 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java
@@ -78,7 +78,6 @@ public abstract class ThreadedHttpRequestHandler extends ThreadedRequestHandler
try {
channel = new LazyContentChannel(httpRequest, responseHandler, metric, log);
HttpResponse httpResponse = handle(httpRequest, channel);
- request.setRequestType(httpResponse.getRequestType());
channel.setHttpResponse(httpResponse); // may or may not have already been done
render(httpRequest, httpResponse, channel, jdiscRequest.creationTime(TimeUnit.MILLISECONDS));
} catch (Exception e) {