Merge pull request #14232 from jaymode/class_set_binding

properly bind ClassSet extensions as singletons
2015-10-21 22:58:25 +02:00 · 2015-10-21 22:58:25 +02:00 · 8f490f527a
parent 06ae2e2176 ec4307f080
commit 8f490f527a
1 changed files with 2 additions and 1 deletions
--- a/core/src/main/java/org/elasticsearch/common/util/ExtensionPoint.java
+++ b/core/src/main/java/org/elasticsearch/common/util/ExtensionPoint.java
@ -191,7 +191,8 @@ public abstract class ExtensionPoint {
        protected final void bindExtensions(Binder binder) {
            Multibinder<T> allocationMultibinder = Multibinder.newSetBinder(binder, extensionClass);
            for (Class<? extends T> clazz : extensions) {
-                allocationMultibinder.addBinding().to(clazz).asEagerSingleton();
+                binder.bind(clazz).asEagerSingleton();
+                allocationMultibinder.addBinding().to(clazz);
            }
        }
    }