Don Willis avatar Don Willis committed 1754721

SOY-3 Always create default Injector first

- Having established that creating the default injector after the other injectors breaks them, ensured that defaultinjector initalisation _always_ happens first.

Comments (0)

Files changed (2)

soy-template-plugin/src/main/java/com/atlassian/soy/impl/SoyDependencyInjectorFactory.java

 
     private Injector makeInjectorForKeys(FunctionModuleData data, SoyDataConverter soyDataConverter)
     {
+        Injector defaultInjector = defaultInjectorRef.get();
         if (data.getSoyFunctions().isEmpty() && data.getWrappedFunctions().isEmpty())
         {
-            Injector defaultInjector = defaultInjectorRef.get();
             return defaultInjector;
         }
 

soy-template-plugin/src/test/java/com/atlassian/soy/impl/SoyDependencyInjectorFactoryTest.java

     }
 
     // SOY-3
-    // Fails because constructing the default injector breaks subsequent injectors
-    @Ignore
     @Test
     public void testExtraAndNoExtraInterspersed() throws Exception
     {
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.