Merge pull request #616 from eclipse/cd_issue_608

[#608] Fixed reuse issue with WrappingInjectorProvider
eclipse · Jan 16, 2018 · b43b008 · b43b008
2 parents 2184d4d + 4f10ab7
commit b43b008
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/...xt.testing/src/org/eclipse/xtext/testing/smoketest/internal/WrappingInjectorProvider.java b/...xt.testing/src/org/eclipse/xtext/testing/smoketest/internal/WrappingInjectorProvider.java
@@ -45,8 +45,14 @@ public WrappingInjectorProvider(IInjectorProvider delegate) {
 		this.delegate = delegate;
 		stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
 		this.injector = createInjector();
+		if (delegate instanceof IRegistryConfigurator) {
+			((IRegistryConfigurator) delegate).setupRegistry();
+		}
 		registerFactory(injector);
 		stateAfterInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
+		if (delegate instanceof IRegistryConfigurator) {
+			((IRegistryConfigurator) delegate).restoreRegistry();
+		}
 	}
 
 	private void registerFactory(Injector injector) {