Merge branch '3.9' of https://github.com/JumpMind/symmetric-ds.git in…

…to 3.9
JumpMind · Mar 1, 2018 · 774a4f9 · 774a4f9
2 parents d7dfee0 + 5e35ff5
commit 774a4f9
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/symmetric-server/src/main/java/org/jumpmind/symmetric/web/rest/RestService.java b/symmetric-server/src/main/java/org/jumpmind/symmetric/web/rest/RestService.java
@@ -49,6 +49,7 @@
 import org.jumpmind.db.util.BasicDataSourcePropertyConstants;
 import org.jumpmind.exception.IoException;
 import org.jumpmind.symmetric.ISymmetricEngine;
+import org.jumpmind.symmetric.SymmetricException;
 import org.jumpmind.symmetric.common.Constants;
 import org.jumpmind.symmetric.common.ParameterConstants;
 import org.jumpmind.symmetric.io.data.writer.StructureDataWriter.PayloadType;
@@ -1343,6 +1344,8 @@ private void syncTriggersImpl(ISymmetricEngine engine, boolean force) {
         ITriggerRouterService triggerRouterService = engine.getTriggerRouterService();
         StringBuilder buffer = new StringBuilder();
         triggerRouterService.syncTriggers(buffer, force);
+
+        assertTriggerCreation(triggerRouterService, null);
     }
 
     private void syncTriggersByTableImpl(ISymmetricEngine engine, String catalogName,
@@ -1354,7 +1357,17 @@ private void syncTriggersByTableImpl(ISymmetricEngine engine, String catalogName
         if (table == null) {
             throw new NotFoundException();
         }
+
         triggerRouterService.syncTriggers(table, force);
+        assertTriggerCreation(triggerRouterService, table);
+    }
+
+    private void assertTriggerCreation(ITriggerRouterService triggerRouterService, Table table){
+        for(Map.Entry<Trigger, Exception> failedTriggers : triggerRouterService.getFailedTriggers().entrySet()){
+            if(table == null || failedTriggers.getKey().getFullyQualifiedSourceTableName().equalsIgnoreCase(table.getFullyQualifiedTableName())){
+                throw new SymmetricException("Trigger creation failed", failedTriggers.getValue());
+            }
+        }
     }
 
     private void dropTriggersImpl(ISymmetricEngine engine) {