SYMMETRICDS-404

JumpMind · Mar 4, 2011 · ee90ba7 · ee90ba7
1 parent 315b1f5
commit ee90ba7
Showing 1 changed file with 20 additions and 18 deletions.
diff --git a/...ymmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/TriggerRouterService.java b/...ymmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/TriggerRouterService.java
@@ -906,24 +906,26 @@ protected String getTriggerName(DataEventType dml, int maxTriggerNameLength, Tri
         }
 
         triggerName = triggerName.toUpperCase();
-
-        if (triggerName.length() > maxTriggerNameLength && maxTriggerNameLength > 0) {
-            int duplicateCount = 0;
-            do {
-                if (duplicateCount == 0) {
-                    triggerName = triggerName.substring(0, maxTriggerNameLength - 1);
-                } else {
-                    String duplicateSuffix = Integer.toString(duplicateCount);
-                    triggerName = triggerName.substring(0, triggerName.length()
-                            - duplicateSuffix.length())
-                            + duplicateSuffix;
-                }
-                duplicateCount++;
-            } while (isTriggerNameInUse(trigger.getTriggerId(), triggerName));
-
-            log.debug("TriggerNameTruncated", dml.name().toLowerCase(), trigger.getTriggerId(),
-                    maxTriggerNameLength);
-        }
+
+        if (triggerName.length() > maxTriggerNameLength && maxTriggerNameLength > 0) {
+            triggerName = triggerName.substring(0, maxTriggerNameLength - 1);
+            log.debug("TriggerNameTruncated", dml.name().toLowerCase(), trigger.getTriggerId(),
+                    maxTriggerNameLength);
+        }
+
+        int duplicateCount = 0;
+        while (isTriggerNameInUse(trigger.getTriggerId(), triggerName)) {
+            duplicateCount++;
+            String duplicateSuffix = Integer.toString(duplicateCount);
+            if (triggerName.length() + duplicateSuffix.length() > maxTriggerNameLength) {
+                triggerName = triggerName.substring(0,
+                        triggerName.length() - duplicateSuffix.length())
+                        + duplicateSuffix;
+            } else {
+                triggerName = triggerName + duplicateSuffix;
+            }
+        }
+
         return triggerName;
     }