azkaban-aplcache

diff --git a/azkaban-common/src/main/java/azkaban/trigger/TriggerManager.java b/azkaban-common/src/main/java/azkaban/trigger/TriggerManager.java
index 19a0af6..2a2f44a 100644
--- a/azkaban-common/src/main/java/azkaban/trigger/TriggerManager.java
+++ b/azkaban-common/src/main/java/azkaban/trigger/TriggerManager.java
@@ -16,6 +16,8 @@
 
 package azkaban.trigger;
 
+import static java.util.Objects.requireNonNull;
+
 import azkaban.event.Event;
 import azkaban.event.Event.Type;
 import azkaban.event.EventHandler;
@@ -58,7 +60,9 @@ public class TriggerManager extends EventHandler implements
   public TriggerManager(Props props, TriggerLoader triggerLoader,
       ExecutorManager executorManager) throws TriggerManagerException {
 
-    this.triggerLoader = triggerLoader;
+    requireNonNull(props);
+    requireNonNull(executorManager);
+    this.triggerLoader = requireNonNull(triggerLoader);
 
     long scannerInterval =
         props.getLong("trigger.scan.interval", DEFAULT_SCANNER_INTERVAL_MS);

diff --git a/azkaban-web-server/src/main/java/azkaban/webapp/AzkabanWebServer.java b/azkaban-web-server/src/main/java/azkaban/webapp/AzkabanWebServer.java
index fb25ffb..116cf99 100644
--- a/azkaban-web-server/src/main/java/azkaban/webapp/AzkabanWebServer.java
+++ b/azkaban-web-server/src/main/java/azkaban/webapp/AzkabanWebServer.java
@@ -195,8 +195,8 @@ public class AzkabanWebServer extends AzkabanServer {
     // TODO remove hack. Move injection to constructor
     executorManager = SERVICE_PROVIDER.getInstance(ExecutorManager.class);
     projectManager = SERVICE_PROVIDER.getInstance(ProjectManager.class);
+    triggerManager = SERVICE_PROVIDER.getInstance(TriggerManager.class);
 
-    triggerManager = loadTriggerManager(props);
     loadBuiltinCheckersAndActions();
 
     // load all trigger agents here
@@ -279,12 +279,6 @@ public class AzkabanWebServer extends AzkabanServer {
     return new ScheduleManager(loader);
   }
 
-  private TriggerManager loadTriggerManager(Props props)
-      throws TriggerManagerException {
-    TriggerLoader loader = new JdbcTriggerLoader(props);
-    return new TriggerManager(props, loader, executorManager);
-  }
-
   private void loadBuiltinCheckersAndActions() {
     logger.info("Loading built-in checker and action types");
     ExecuteFlowAction.setExecutorManager(executorManager);