- public java.lang.AutoCloseable createInstance() {
- final GeneratedClassLoadingStrategy classLoading = getGlobalClassLoadingStrategy();
- final BindingNormalizedNodeCodecRegistry codecRegistry = new BindingNormalizedNodeCodecRegistry(StreamWriterGenerator.create(SingletonHolder.JAVASSIST));
- final BindingToNormalizedNodeCodec instance = new BindingToNormalizedNodeCodec(classLoading, codecRegistry,getWaitForSchema());
- bundleContext.registerService(SchemaContextListener.class, instance, new Hashtable<String,String>());
- return instance;
- }
+ public AutoCloseable createInstance() {
+ // We need to return the concrete BindingToNormalizedNodeCodec instance for backwards compatibility
+ // for CSS users that inject the binding-dom-mapping-service.
+ final WaitingServiceTracker<BindingToNormalizedNodeCodec> tracker =
+ WaitingServiceTracker.create(BindingToNormalizedNodeCodec.class, bundleContext);
+ final BindingToNormalizedNodeCodec service = tracker.waitForService(WaitingServiceTracker.FIVE_MINUTES);