summaryrefslogtreecommitdiffstats
path: root/container-disc
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2021-07-02 13:16:25 +0200
committerJon Marius Venstad <venstad@gmail.com>2021-08-16 21:01:03 +0200
commitba0cf910aec5e4bd921e4e7d77010982537490ad (patch)
tree387a783c56a0e2abaa1a57fc578a210f289a622d /container-disc
parent249377274b11826daffe0ae8c2bf3424e758dadb (diff)
Revert "Merge pull request #18515 from vespa-engine/revert-18507-jonmv/reapply-session-cache-with-injected-config"
This reverts commit fdea20ac7ba02313c94246e7cf77125320147d56, reversing changes made to 7537c42fa661952916cf91eebbb75e6984505100.
Diffstat (limited to 'container-disc')
-rw-r--r--container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java4
1 files changed, 0 insertions, 4 deletions
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java
index 0e4c4446778..f43c1fcffd6 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java
@@ -18,7 +18,6 @@ import com.yahoo.container.di.config.Subscriber;
import com.yahoo.container.di.config.SubscriberFactory;
import com.yahoo.container.http.filter.FilterChainRepository;
import com.yahoo.container.jdisc.component.Deconstructor;
-import com.yahoo.container.jdisc.messagebus.SessionCache;
import com.yahoo.container.jdisc.metric.DisableGuiceMetric;
import com.yahoo.jdisc.Metric;
import com.yahoo.jdisc.application.Application;
@@ -77,7 +76,6 @@ public final class ConfiguredApplication implements Application {
// to config to make sure that container will be registered in slobrok (by {@link com.yahoo.jrt.slobrok.api.Register})
// if slobrok config changes (typically slobroks moving to other nodes)
private final Optional<SlobrokConfigSubscriber> slobrokConfigSubscriber;
- private final SessionCache sessionCache;
//TODO: FilterChainRepository should instead always be set up in the model.
private final FilterChainRepository defaultFilterChainRepository =
@@ -127,7 +125,6 @@ public final class ConfiguredApplication implements Application {
this.slobrokConfigSubscriber = (subscriberFactory instanceof CloudSubscriberFactory)
? Optional.of(new SlobrokConfigSubscriber(configId))
: Optional.empty();
- this.sessionCache = new SessionCache(configId);
this.restrictedOsgiFramework = new DisableOsgiFramework(new RestrictedBundleContext(osgiFramework.bundleContext()));
}
@@ -349,7 +346,6 @@ public final class ConfiguredApplication implements Application {
bind(OsgiFramework.class).toInstance(restrictedOsgiFramework);
bind(com.yahoo.jdisc.Timer.class).toInstance(timerSingleton);
bind(FilterChainRepository.class).toInstance(defaultFilterChainRepository);
- bind(SessionCache.class).toInstance(sessionCache); // Needed by e.g. FeedHandler
}
});
}