null out blank schema and catalogs

JumpMind · Aug 30, 2011 · 0cdd4b8 · 0cdd4b8
1 parent 2c394de
commit 0cdd4b8
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/model/Router.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/model/Router.java
@@ -70,6 +70,15 @@ public class Router implements Serializable {
 
     public Router() {
         routerId = Integer.toString(maxRouterId++);
+    }
+
+    public void nullOutBlankFields() {
+        if (StringUtils.isBlank(targetCatalogName)) {
+            targetCatalogName = null;
+        } 
+        if (StringUtils.isBlank(targetSchemaName)) {
+            targetSchemaName = null;
+        } 
     }
 
     public Date getCreateTime() {

diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/model/Trigger.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/model/Trigger.java
@@ -115,6 +115,15 @@ final public String qualifiedSourceTablePrefix() {
         String catalogPlus = (getSourceCatalogName() != null ? getSourceCatalogName()
                 + "." : "") + schemaPlus;
         return catalogPlus;
+    }
+
+    public void nullOutBlankFields() {
+        if (StringUtils.isBlank(sourceCatalogName)) {
+            sourceCatalogName = null;
+        } 
+        if (StringUtils.isBlank(sourceSchemaName)) {
+            sourceSchemaName = null;
+        } 
     }
 
     /**

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
@@ -623,7 +623,8 @@ protected void resetTriggerRouterCacheByNodeGroupId() {
     }
 
     public void saveRouter(Router router) {
-        router.setLastUpdateTime(new Date());
+        router.setLastUpdateTime(new Date());
+        router.nullOutBlankFields();
         if (0 == jdbcTemplate.update(getSql("updateRouterSql"), new Object[] {
                 router.getTargetCatalogName(), router.getTargetSchemaName(),
                 router.getTargetTableName(), router.getNodeGroupLink().getSourceNodeGroupId(),
@@ -663,7 +664,8 @@ public void deleteRouter(Router router) {
     }
 
     public void saveTrigger(Trigger trigger) {
-        trigger.setLastUpdateTime(new Date());
+        trigger.setLastUpdateTime(new Date());
+        trigger.nullOutBlankFields();
         if (0 == jdbcTemplate.update(getSql("updateTriggerSql"), new Object[] {
                 trigger.getSourceCatalogName(), trigger.getSourceSchemaName(),
                 trigger.getSourceTableName(), trigger.getChannelId(),