From 959a1f101a4de599a1cf31e37082bba5a6729b4a Mon Sep 17 00:00:00 2001
From: chenson42 <chenson42@gmail.com>
Date: Tue, 7 Aug 2012 17:17:45 +0000
Subject: [PATCH] 0000752: Null pointer during trigger inactivation of deleted
 table can cause SymmetricDS engine not to start

---
 .../jumpmind/symmetric/service/impl/TriggerRouterService.java   | 2 +-
 1 file changed, 1 insertion(+), 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
index 5b73fe0eae..caee404411 100644
--- 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);
             }