- public java.lang.AutoCloseable createInstance() {
- EventExecutor eventExecutor = GlobalEventExecutor.INSTANCE;
- return CloseableEventExecutorMixin.createCloseableProxy(eventExecutor);
+ public AutoCloseable createInstance() {
+ // The service is provided via blueprint so wait for and return it here for backwards compatibility.
+ final WaitingServiceTracker<EventExecutor> tracker = WaitingServiceTracker.create(
+ EventExecutor.class, bundleContext, "(type=global-event-executor)");
+ EventExecutor eventExecutor = tracker.waitForService(WaitingServiceTracker.FIVE_MINUTES);
+ return CloseableEventExecutorMixin.forwardingEventExecutor(eventExecutor, tracker);