don't try to create data if history is null

JumpMind · May 29, 2009 · 2887d79 · 2887d79
1 parent c57aa13
commit 2887d79
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/service/impl/DataService.java b/symmetric/src/main/java/org/jumpmind/symmetric/service/impl/DataService.java
@@ -304,8 +304,7 @@ public void insertHeartbeatEvent(Node node) {
         if (data != null) {
             insertDataEvent(data, Constants.CHANNEL_CONFIG, nodeService.findNodesToPushTo());
         } else {
-            logger
-                    .info("Not generating data/data events for node because a trigger is not created for that table yet.");
+            logger.info("Not generating data/data events for table " + tableName + " because a trigger or trigger hist is not created yet");
         }
     }
 
@@ -340,7 +339,9 @@ public Data createData(Trigger trigger, String whereClause) {
                     history = configurationService.getTriggerHistoryForSourceTable(trigger.getSourceTableName().toUpperCase());
                 }
             }
-            data = new Data(trigger.getSourceTableName(), DataEventType.UPDATE, rowData, pkData, history);
+            if (history != null) {
+                data = new Data(trigger.getSourceTableName(), DataEventType.UPDATE, rowData, pkData, history);
+            }
         }
         return data;
     }