0005295: Fixed table group bugs and ran spotlessApply

JumpMind · Jun 22, 2022 · e51705d · e51705d
1 parent 3d58fc2
commit e51705d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/extract/SelectFromSymDataSource.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/extract/SelectFromSymDataSource.java
@@ -63,6 +63,8 @@ public class SelectFromSymDataSource extends SelectFromSource {
     protected OutgoingBatch outgoingBatch;
     protected TriggerHistory lastTriggerHistory;
     protected String lastRouterId;
+    protected Table lastSourceTable;
+    protected Table lastTargetTable;
     protected boolean requiresLobSelectedFromSource;
     protected ISqlReadCursor<Data> cursor;
     protected SelectFromTableSource reloadSource;
@@ -137,7 +139,8 @@ public CsvData next() {
                     Trigger trigger = triggerRouter.getTrigger();
                     boolean isFileParserRouter = triggerHistory.getTriggerId().equals(AbstractFileParsingRouter.TRIGGER_ID_FILE_PARSER);
                     if (lastTriggerHistory == null || lastTriggerHistory.getTriggerHistoryId() != triggerHistory.getTriggerHistoryId() ||
-                            lastRouterId == null || !lastRouterId.equals(routerId)) {
+                            lastRouterId == null || !lastRouterId.equals(routerId) || lastSourceTable == null ||
+                            !lastSourceTable.equals(sourceTable) || lastTargetTable == null || !lastTargetTable.equals(targetTable)) {
                         sourceTable = columnsAccordingToTriggerHistory.lookup(routerId, triggerHistory, false, !isFileParserRouter);
                         targetTable = columnsAccordingToTriggerHistory.lookup(routerId, triggerHistory, true, false);
                         if (trigger != null && trigger.isUseStreamLobs() || (data.getRowData() != null && hasLobsThatNeedExtract(sourceTable, data))) {
@@ -171,6 +174,8 @@ public CsvData next() {
                 if (data != null) {
                     lastTriggerHistory = data.getTriggerHistory();
                     lastRouterId = routerId;
+                    lastSourceTable = sourceTable;
+                    lastTargetTable = targetTable;
                 }
             } else {
                 closeCursor();

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/transport/AbstractTransportManager.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/transport/AbstractTransportManager.java
@@ -200,7 +200,7 @@ public Map<String, String> readRequestProperties(InputStream is) throws IOExcept
     }
 
     private static BatchAck getBatchInfo(Map<String, ? extends Object> parameters, long batchId) {
-        BatchAck batchInfo = new BatchAck(batchId);        
+        BatchAck batchInfo = new BatchAck(batchId);
         String nodeId = getParam(parameters, WebConstants.ACK_NODE_ID + batchId);
         if (StringUtils.isBlank(nodeId)) {
             nodeId = getParam(parameters, WebConstants.NODE_ID);