Merge remote-tracking branch 'origin/master'

Evolveum · Jun 26, 2014 · ace8e29 · ace8e29
2 parents 21606fa + 12c8513
commit ace8e29
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/GuiComponents.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/GuiComponents.java
@@ -36,7 +36,8 @@
  */
 public class GuiComponents {
 
-    private static final ExecutorService EXECUTOR = Executors.newFixedThreadPool(10);
+    private static ExecutorService EXECUTOR;
+
     private static final String KEY_BOOLEAN_NULL = "Boolean.NULL";
     private static final String KEY_BOOLEAN_TRUE = "Boolean.TRUE";
     private static final String KEY_BOOLEAN_FALSE = "Boolean.FALSE";
@@ -45,6 +46,10 @@ public static void destroy() {
         EXECUTOR.shutdownNow();
     }
 
+    public static void init() {
+        EXECUTOR = Executors.newFixedThreadPool(10);
+    }
+
     public static <T> Future<T> submitCallable(Callable<T> callable) {
         Validate.notNull(callable, "Callable must not be null.");
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
@@ -118,6 +118,8 @@ public Class<PageDashboard> getHomePage() {
     public void init() {
         super.init();
 
+        GuiComponents.init();
+
         getComponentInstantiationListeners().add(new SpringComponentInjector(this));
 
         IResourceSettings resourceSettings = getResourceSettings();