Merge pull request #13842 from jasontedor/workaround-jdk-8056014

Workaround JDK-8056014
2015-09-29 15:43:25 +02:00 · 2015-09-29 15:43:25 +02:00 · 882fe0784c
parent 8a7f9edf02 ad090296fc
commit 882fe0784c
1 changed files with 2 additions and 1 deletions
--- a/core/src/main/java/org/elasticsearch/common/inject/util/Modules.java
+++ b/core/src/main/java/org/elasticsearch/common/inject/util/Modules.java
@ -135,7 +135,8 @@ public final class Modules {
        private final Set<Module> baseModules;

        private RealOverriddenModuleBuilder(Iterable<? extends Module> baseModules) {
-            this.baseModules = unmodifiableSet(newHashSet(baseModules));
+            HashSet<? extends Module> modules = newHashSet(baseModules);
+            this.baseModules = unmodifiableSet(modules);
        }

        @Override