0004483: Role tables are not filtered for pre-3.9 installations

JumpMind · Jul 20, 2020 · 9476107 · 9476107
1 parent 3c2b108
commit 9476107
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/...etric-core/src/main/java/org/jumpmind/symmetric/route/ConfigurationChangedDataRouter.java b/...etric-core/src/main/java/org/jumpmind/symmetric/route/ConfigurationChangedDataRouter.java
@@ -262,10 +262,14 @@ protected Set<Node> filterOutOlderNodes(DataMetaData dataMetaData, Set<Node> pos
         if (tableMatches(dataMetaData, TableConstants.SYM_MONITOR)
                 || tableMatches(dataMetaData, TableConstants.SYM_MONITOR_EVENT) 
                 || tableMatches(dataMetaData, TableConstants.SYM_NOTIFICATION)
-                || tableMatches(dataMetaData, TableConstants.SYM_JOB)) {
+                || tableMatches(dataMetaData, TableConstants.SYM_JOB)
+                || tableMatches(dataMetaData, TableConstants.SYM_CONSOLE_ROLE)
+                || tableMatches(dataMetaData, TableConstants.SYM_CONSOLE_ROLE_PRIVILEGE)) {
             Set<Node> targetNodes = new HashSet<Node>(possibleTargetNodes.size());
             for (Node nodeThatMayBeRoutedTo : possibleTargetNodes) {
-                if (tableMatches(dataMetaData, TableConstants.SYM_JOB)) {
+                if (tableMatches(dataMetaData, TableConstants.SYM_JOB)
+                        || tableMatches(dataMetaData, TableConstants.SYM_CONSOLE_ROLE)
+                        || tableMatches(dataMetaData, TableConstants.SYM_CONSOLE_ROLE_PRIVILEGE)) {
                     if (nodeThatMayBeRoutedTo.isVersionGreaterThanOrEqualTo(3, 9, 0)) {
                         targetNodes.add(nodeThatMayBeRoutedTo);
                     }

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
@@ -270,7 +270,7 @@ protected boolean filter(Node targetNode, String tableName) {
 
         tableName = tableName.toLowerCase();
         boolean include = true;
-        if (pre39 && tableName.contains(TableConstants.SYM_JOB)) {
+        if (pre39 && (tableName.contains(TableConstants.SYM_JOB) || tableName.contains(TableConstants.SYM_CONSOLE_ROLE) || tableName.contains(TableConstants.SYM_CONSOLE_ROLE_PRIVILEGE))) {
             include = false;
         } else if (pre37 && tableName.contains(TableConstants.SYM_EXTENSION)) {
             include = false;