Merge remote-tracking branch 'origin/3.10' into 3.11

JumpMind · Oct 27, 2019 · 0866721 · 0866721
2 parents 9f2dbd4 + 3521c32
commit 0866721
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/symmetric-client/build.gradle b/symmetric-client/build.gradle
@@ -8,12 +8,11 @@ apply from: symAssembleDir + '/common.gradle'
         compile "org.springframework:spring-context:$springVersion"
         compile "commons-cli:commons-cli:$commonsCliVersion"
         compile "commons-vfs:commons-vfs:1.0"
-        // compile "com.jcraft:jsch:0.1.48"
 
         provided "org.mongodb:mongo-java-driver:2.12.3"
         provided "org.codehaus.mojo:animal-sniffer-annotations:$animalSnifferVersion"
 
-        provided ("com.amazon.redshift:redshift-jdbc42-no-awssdk:1.2.18.1036") {
+        provided ("com.amazon.redshift:redshift-jdbc42-no-awssdk:1.2.36.1060") {
 			exclude group: 'org.apache.httpcomponents'
             exclude group: 'commons-logging'
             exclude group: 'com.fasterxml.jackson.core'
@@ -28,13 +27,13 @@ apply from: symAssembleDir + '/common.gradle'
         }
 
         provided ("com.microsoft.azure:azure-storage:8.1.0") {
-        		exclude group: 'com.fasterxml.jackson.core'
-                exclude group: 'org.slf4j'
-        	}
+            exclude group: 'com.fasterxml.jackson.core'
+            exclude group: 'org.slf4j'
+        }
 
         provided ("net.snowflake:snowflake-jdbc:3.6.27") {
-        		exclude group: 'com.fasterxml.jackson.core'
-        	}
+            exclude group: 'com.fasterxml.jackson.core'
+        }
 
         provided 'org.apache.phoenix:phoenix:5.0.0-HBase-2.0'
 

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/PurgeService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/PurgeService.java
@@ -93,10 +93,6 @@ public long purgeOutgoing(boolean force) {
             log.info("The outgoing purge process has completed");
         }
 
-        List<IPurgeListener> purgeListeners = extensionService.getExtensionPointList(IPurgeListener.class);
-        for (IPurgeListener purgeListener : purgeListeners) {
-            rowsPurged += purgeListener.purgeOutgoing(force);
-        }        
         return rowsPurged;
     }
 
@@ -106,11 +102,6 @@ public long purgeIncoming(boolean force) {
         retentionCutoff.add(Calendar.MINUTE,
                 -parameterService.getInt(ParameterConstants.PURGE_RETENTION_MINUTES));
         rowsPurged += purgeIncoming(retentionCutoff, force);
-
-        List<IPurgeListener> purgeListeners = extensionService.getExtensionPointList(IPurgeListener.class);
-        for (IPurgeListener purgeListener : purgeListeners) {
-            rowsPurged += purgeListener.purgeIncoming(force);
-        }
 
         return rowsPurged;
     }
@@ -134,6 +125,11 @@ public long purgeOutgoing(Calendar retentionCutoff, boolean force) {
                     rowsPurged += purgeExtractRequests();
                     rowsPurged += purgeStrandedChannels();
                 }
+
+                List<IPurgeListener> purgeListeners = extensionService.getExtensionPointList(IPurgeListener.class);
+                for (IPurgeListener purgeListener : purgeListeners) {
+                    rowsPurged += purgeListener.purgeOutgoing(force);
+                }
             } finally {
                 if (!force) {
                     clusterService.unlock(ClusterConstants.PURGE_OUTGOING);
@@ -462,6 +458,11 @@ public long purgeIncoming(Calendar retentionCutoff, boolean force) {
                     purgedRowCount += purgeIncomingError();
                     purgedRowCount += purgeRegistrationRequests();
                     purgedRowCount += purgeMonitorEvents();
+
+                    List<IPurgeListener> purgeListeners = extensionService.getExtensionPointList(IPurgeListener.class);
+                    for (IPurgeListener purgeListener : purgeListeners) {
+                        purgedRowCount += purgeListener.purgeIncoming(force);
+                    }
                 } finally {
                     if (!force) {
                         clusterService.unlock(ClusterConstants.PURGE_INCOMING);