Merge pull request #23 from neuland/hmc-reset-locked

do both update and hmc reset in a 'locked' context (uses reflections)

Author: FlashKorten

src/de/neuland/firefly/HybrisAdapter.java

@@ -3,6 +3,8 @@
 import de.hybris.platform.core.Initialization;
 import de.hybris.platform.core.PK;
 import de.hybris.platform.core.Registry;
+import de.hybris.platform.core.system.InitializationLockHandler;
+import de.hybris.platform.core.system.impl.DefaultInitLockDao;
 import de.hybris.platform.regioncache.CacheController;
 import de.hybris.platform.servicelayer.event.EventService;
 import de.hybris.platform.util.JspContext;
@@ -13,11 +15,18 @@
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.stereotype.Component;
 
+import java.lang.reflect.Method;
+import java.util.concurrent.Callable;
+
+import static java.lang.String.format;
+
 
 @Component
 @Scope("prototype")
 public class HybrisAdapter {
     private static final Logger LOG = Logger.getLogger(HybrisAdapter.class);
+    private static final String SYSTEM_UPDATE = "System update";
+    private static final String HMC_RESET = "HMC Reset";
     @Autowired EventService eventService;
     @Autowired CacheController cacheController;
 
@@ -53,12 +62,34 @@ private void doInitialize(boolean update) throws Exception {
             request.addParameter("clearHMC", "true");
 
             JspContext jspContext = new JspContext(jspWriter, request, new MockHttpServletResponse());
-            Initialization.doInitialize(jspContext);
+
+            try {
+                InitializationLockHandler handler = new InitializationLockHandler(new DefaultInitLockDao());
+                String operationName = update ? SYSTEM_UPDATE : HMC_RESET;
+
+                handler.performLocked(Registry.getCurrentTenant(),
+                                      createInitializeCallable(jspContext),
+                                      operationName);
+            } catch (NoSuchMethodException e) {
+                LOG.info(format("Internal reflection unsuccessful: system is not locked while performing '%s only' change.", HMC_RESET));
+                Initialization.doInitialize(jspContext);
+            }
         } finally {
             LOG.debug(de.hybris.platform.util.Utilities.filterOutHTMLTags(jspWriter.getString()));
         }
     }
 
+    private Callable<Boolean> createInitializeCallable(final JspContext jspContext) {
+        return new Callable<Boolean>() {
+            public Boolean call() throws Exception {
+                Method m = Initialization.class.getDeclaredMethod("doInitializeImpl", JspContext.class);
+                m.setAccessible(true);
+                m.invoke(null, jspContext);
+                return Boolean.TRUE;
+            }
+        };
+    }
+
     public void clearHmcConfiguration(PK migration) throws Exception {
         doInitialize(false);
         eventService.publishEvent(new HmcResetEvent(getTenantId(), migration));