#239 Injector should not be set in case of testing

javalite · Sep 23, 2015 · 259f26c · 259f26c
1 parent b492052
commit 259f26c
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/activeweb/src/main/java/org/javalite/activeweb/RequestDispatcher.java b/activeweb/src/main/java/org/javalite/activeweb/RequestDispatcher.java
@@ -132,8 +132,12 @@ private void initAppConfig(String configClassName, AppContext context, boolean f
             appConfig.init(context);
             if(appConfig instanceof  Bootstrap){
                 appBootstrap = (Bootstrap) appConfig;
+                Injector injector = appBootstrap.getInjector();
                 if(!Configuration.isTesting() ){
-                    Context.getControllerRegistry().setInjector(appBootstrap.getInjector());
+                    if(Context.getControllerRegistry().getInjector() != null && injector != null){
+                        throw new InitException("Either use setInjector() or getInjector(), but not both...");
+                    }
+                    Context.getControllerRegistry().setInjector(injector);
                 }
             }
             appConfig.completeInit();