[Amdatu-commits] SVN r249 - trunk/platform-bundles/shindig-application/src/main/java/org/amdatu/platform/shindig/application/service

[subvers...@amdatu.org]

Author: ivol37 at gmail.com
Date: Thu Nov  4 16:13:28 2010
New Revision: 249

Log:
[AMDATU-151] Changed order of copying security token, this needs to be done 
before Guice injector is created otherwise this could lead to stacktraces upon 
start

Modified:
   
trunk/platform-bundles/shindig-application/src/main/java/org/amdatu/platform/shindig/application/service/ShindigRegistrationServiceImpl.java

Modified: 
trunk/platform-bundles/shindig-application/src/main/java/org/amdatu/platform/shindig/application/service/ShindigRegistrationServiceImpl.java
==============================================================================
--- 
trunk/platform-bundles/shindig-application/src/main/java/org/amdatu/platform/shindig/application/service/ShindigRegistrationServiceImpl.java
        (original)
+++ 
trunk/platform-bundles/shindig-application/src/main/java/org/amdatu/platform/shindig/application/service/ShindigRegistrationServiceImpl.java
        Thu Nov  4 16:13:28 2010
@@ -93,9 +93,11 @@
      */
     public void init() {
         // Beware! The order in which httpcontext, Guice servlet and other 
services are created is very important!
-        // 
+        
+        // First of all copy the security token key, this is needed by the 
Guice injector
+        copySecurityTokenKey();
 
-        // First of all we need to create our own http context to register 
resources, filters and servlets
+        // Now we need to create our own http context to register resources, 
filters and servlets
         m_httpContextComponent = 
m_httpContextFactoryService.create(m_bundleContext, this);
         m_httpContext = (HttpContext) m_httpContextComponent.getService();
 
@@ -132,8 +134,6 @@
         
m_dependencyManager.createServiceDependency().setService(GuiceInjectorServlet.class.getName())
             .setRequired(true);
 
-        copySecurityTokenKey();
-
         m_logService.log(LogService.LOG_INFO, getClass().getName() + " service 
initialized");
 
     }