0001781: Uninstall fails if file sync is configured

JumpMind · Jun 27, 2014 · 1a5c58b · 1a5c58b
1 parent e9c2928
commit 1a5c58b
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/AbstractSymmetricEngine.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/AbstractSymmetricEngine.java
@@ -57,6 +57,7 @@
 import org.jumpmind.symmetric.io.stage.IStagingManager;
 import org.jumpmind.symmetric.job.DefaultOfflineServerListener;
 import org.jumpmind.symmetric.job.IJobManager;
+import org.jumpmind.symmetric.model.FileTriggerRouter;
 import org.jumpmind.symmetric.model.Grouplet;
 import org.jumpmind.symmetric.model.Node;
 import org.jumpmind.symmetric.model.NodeGroupLink;
@@ -575,10 +576,16 @@ public synchronized void uninstall() {
                     triggerRouterService.deleteTriggerRouter(triggerRouter);
                 }
 
-                for (TriggerRouter triggerRouter : triggerRouters) {
-                    triggerRouterService.deleteTrigger(triggerRouter.getTrigger());
-                    triggerRouterService.deleteRouter(triggerRouter.getRouter());
+                List<FileTriggerRouter> fileTriggerRouters = fileSyncService.getFileTriggerRouters();
+                for (FileTriggerRouter fileTriggerRouter : fileTriggerRouters) {
+                    fileSyncService.deleteFileTriggerRouter(fileTriggerRouter);
+                }
+
+                List<Router> routers = triggerRouterService.getRouters();
+                for (Router router : routers) {
+                    triggerRouterService.deleteRouter(router);    
                 }
+
             }
 
             table = platform.readTableFromDatabase(null, null, TableConstants.getTableName(