0002763: UI Problems when a row in sym_data has a bad trigger_hist_id

JumpMind · Sep 6, 2016 · 770726d · 770726d
1 parent 4fe03fb
commit 770726d
Showing 1 changed file with 5 additions and 3 deletions.
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
@@ -133,7 +133,7 @@ public class TriggerRouterService extends AbstractService implements ITriggerRou
      * Cache the history for performance. History never changes and does not
      * grow big so this should be OK.
      */
-    private HashMap<Integer, TriggerHistory> historyMap = new HashMap<Integer, TriggerHistory>();
+    private Map<Integer, TriggerHistory> historyMap = Collections.synchronizedMap(new HashMap<Integer, TriggerHistory>());
 
     public TriggerRouterService(ISymmetricEngine engine) {
         super(engine.getParameterService(), engine.getSymmetricDialect());
@@ -376,9 +376,11 @@ public List<TriggerHistory> findTriggerHistories(String catalogName, String sche
     public TriggerHistory getTriggerHistory(int histId) {
         TriggerHistory history = historyMap.get(histId);
         if (history == null && histId >= 0) {
-            history = (TriggerHistory) sqlTemplate.queryForObject(getSql("triggerHistSql"),
+            history = sqlTemplate.queryForObject(getSql("triggerHistSql"),
                     new TriggerHistoryMapper(), histId);
-            historyMap.put(histId, history);
+            if (history != null) {                
+                historyMap.put(histId, history);
+            }
         }
         return history;
     }