Get request handler spec through delegate

2 files changed, 14 insertions, 2 deletions

diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/ContainerSnapshot.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/ContainerSnapshot.java
index 1a3f7068024..7b72e95ac09 100644
--- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/ContainerSnapshot.java
+++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/ContainerSnapshot.java
@@ -9,6 +9,7 @@ import com.yahoo.jdisc.ResourceReference;
 import com.yahoo.jdisc.application.BindingMatch;
 import com.yahoo.jdisc.application.BindingSet;
 import com.yahoo.jdisc.handler.ContentChannel;
+import com.yahoo.jdisc.handler.DelegatedRequestHandler;
 import com.yahoo.jdisc.handler.NullContent;
 import com.yahoo.jdisc.handler.RequestHandler;
 import com.yahoo.jdisc.handler.ResponseHandler;
@@ -71,7 +72,7 @@ class ContainerSnapshot extends AbstractResource implements Container {
         return timeoutMgr.timer().currentTimeMillis();
     }
 
-    private static class NullContentRequestHandler implements RequestHandler {
+    private static class NullContentRequestHandler implements DelegatedRequestHandler {
 
         final RequestHandler delegate;
 
@@ -108,5 +109,10 @@ class ContainerSnapshot extends AbstractResource implements Container {
         public String toString() {
             return delegate.toString();
         }
+
+        @Override
+        public RequestHandler getDelegate() {
+            return delegate;
+        }
     }
 }
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/TimeoutManagerImpl.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/TimeoutManagerImpl.java
index 43cddaea803..a6d6e32df06 100644
--- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/TimeoutManagerImpl.java
+++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/TimeoutManagerImpl.java
@@ -9,6 +9,7 @@ import com.yahoo.jdisc.TimeoutManager;
 import com.yahoo.jdisc.Timer;
 import com.yahoo.jdisc.handler.CompletionHandler;
 import com.yahoo.jdisc.handler.ContentChannel;
+import com.yahoo.jdisc.handler.DelegatedRequestHandler;
 import com.yahoo.jdisc.handler.RequestHandler;
 import com.yahoo.jdisc.handler.ResponseHandler;
 
@@ -106,7 +107,7 @@ public class TimeoutManagerImpl {
         }
     }
 
-    private class ManagedRequestHandler implements RequestHandler {
+    private class ManagedRequestHandler implements DelegatedRequestHandler {
 
         final RequestHandler delegate;
 
@@ -152,6 +153,11 @@ public class TimeoutManagerImpl {
         public String toString() {
             return delegate.toString();
         }
+
+        @Override
+        public RequestHandler getDelegate() {
+            return delegate;
+        }
     }
 
     private class TimeoutHandler implements ResponseHandler, TimeoutManager {