0000752: Null pointer during trigger inactivation of deleted table ca…

…n cause SymmetricDS engine not to start
JumpMind · Aug 7, 2012 · 959a1f1 · 959a1f1
1 parent 3fca14b
commit 959a1f1
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/TriggerRouterService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/TriggerRouterService.java
@@ -802,7 +802,7 @@ protected void inactivateTriggers(List<Trigger> triggersThatShouldBeActive,
             boolean removeTrigger = false;
             Set<Table> tables = tablesByTriggerId.get(history.getTriggerId());
             Trigger trigger = getTriggerById(history.getTriggerId(), false);
-            if (tables == null) {
+            if (tables == null && trigger != null) {
                 tables = getTablesForTrigger(trigger, triggersThatShouldBeActive);
                 tablesByTriggerId.put(trigger.getTriggerId(), tables);
             }