move completeBatch to the abstract level cuz it is not always needed.

JumpMind · Aug 12, 2009 · c36c92a · c36c92a
1 parent 6c09b8a
commit c36c92a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 13 deletions.
diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/route/AbstractDataRouter.java b/symmetric/src/main/java/org/jumpmind/symmetric/route/AbstractDataRouter.java
@@ -125,4 +125,9 @@ protected Set<String> toNodeIds(Set<Node> nodes) {
         return nodeIds;
     }
 
+    /**
+     * Override if needed.
+     */
+    public void completeBatch(IRouterContext context) {
+    }
 }
diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/route/BshDataRouter.java b/symmetric/src/main/java/org/jumpmind/symmetric/route/BshDataRouter.java
@@ -20,9 +20,6 @@ public class BshDataRouter extends AbstractDataRouter {
 
     protected IDbDialect dbDialect;
 
-    public void completeBatch(IRouterContext context) {
-    }
-
     public Collection<String> routeToNodes(IRouterContext context, DataMetaData dataMetaData, Set<Node> nodes,
             boolean initialLoad) {
         try {
@@ -31,9 +28,9 @@ public Collection<String> routeToNodes(IRouterContext context, DataMetaData data
             Object value = interpreter.eval(dataMetaData.getTrigger().getRouterExpression());
             return eval(value, nodes);
         } catch (EvalError e) {
-            logger.error(e, e);
+            logger.error("Error in data router.  Routing to nobody.", e);
+            return Collections.emptySet();
         }
-        return Collections.emptySet();
     }
 
     protected Collection<String> eval(Object value, Set<Node> nodes) {

diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/route/ColumnMatchDataRouter.java b/symmetric/src/main/java/org/jumpmind/symmetric/route/ColumnMatchDataRouter.java
@@ -108,10 +108,6 @@ public Collection<String> routeToNodes(IRouterContext routingContext, DataMetaDa
         return nodeIds;
 
     }
-
-    public void completeBatch(IRouterContext context) {
-
-    }
 
     public void setRegistrationService(IRegistrationService registrationService) {
         this.registrationService = registrationService;

diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/route/SubSelectDataRouter.java b/symmetric/src/main/java/org/jumpmind/symmetric/route/SubSelectDataRouter.java
@@ -58,10 +58,6 @@ public Collection<String> routeToNodes(IRouterContext routingContext, DataMetaDa
         return nodeIds;
     }
 
-    public void completeBatch(IRouterContext context) {
-
-    }
-
     public void setSql(String sql) {
         this.sql = sql;
     }