0002784: 3.5 version of SymmetricDS will not register with a 3.8.3

server
JumpMind · Sep 9, 2016 · e84c260 · e84c260
1 parent 5f5bb2f
commit e84c260
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataExtractorService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataExtractorService.java
@@ -203,6 +203,19 @@ public DataExtractorService(ISymmetricEngine engine) {
     public void extractConfigurationStandalone(Node node, OutputStream out) {
         this.extractConfigurationStandalone(node, TransportUtils.toWriter(out));
     }
+
+    protected boolean filter(boolean pre38, boolean pre37, String tableName) {
+        tableName = tableName.toLowerCase();
+        boolean include = true;
+        if (pre37 && tableName.contains(TableConstants.SYM_EXTENSION)) {
+            include = false;
+        }
+        if (pre38 && (tableName.contains(TableConstants.SYM_MONITOR) || 
+                tableName.contains(TableConstants.SYM_NOTIFICATION))) {
+            include = false;
+        }
+        return include;
+    }
 
     /**
      * Extract the SymmetricDS configuration for the passed in {@link Node}.
@@ -230,14 +243,14 @@ public void extractConfigurationStandalone(Node targetNode, Writer writer,
                     triggerRouters.size() * 2);
 
             boolean pre37 = Version.isOlderThanVersion(targetNode.getSymmetricVersion(), "3.7.0");
+            boolean pre38 = Version.isOlderThanVersion(targetNode.getSymmetricVersion(), "3.8.0");
 
             for (int i = triggerRouters.size() - 1; i >= 0; i--) {
                 TriggerRouter triggerRouter = triggerRouters.get(i);
                 String channelId = triggerRouter.getTrigger().getChannelId();
                 if (Constants.CHANNEL_CONFIG.equals(channelId)
                         || Constants.CHANNEL_HEARTBEAT.equals(channelId)) {
-                    if (!(pre37 && triggerRouter.getTrigger().getSourceTableName().toLowerCase()
-                            .contains("extension"))) {
+                    if (filter(pre37, pre38, triggerRouter.getTrigger().getSourceTableName())) {
 
                         TriggerHistory triggerHistory = triggerRouterService
                                 .getNewestTriggerHistoryForTrigger(triggerRouter.getTrigger()