SYMMETRICDS-573 - ColumnMatchDataRouter incorrectly parses router exp…

…ressions with column names that contain 'OR'. e.g. CONCENTRATOR_ID
JumpMind · Jan 25, 2012 · 3242f55 · 3242f55
1 parent 29bd0c3
commit 3242f55
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...tric/symmetric-core/src/main/java/org/jumpmind/symmetric/route/ColumnMatchDataRouter.java b/...tric/symmetric-core/src/main/java/org/jumpmind/symmetric/route/ColumnMatchDataRouter.java
@@ -171,7 +171,7 @@ protected List<Expression> getExpressions(Router router, SimpleRouterContext con
     protected List<Expression> parse(String routerExpression) {
         List<Expression> expressions = new ArrayList<Expression>();       
         if (!StringUtils.isBlank(routerExpression)) {           
-            String[] expTokens = routerExpression.split("\r\n|\r|\n|\\s*or\\s*|\\s*OR\\s*");
+            String[] expTokens = routerExpression.split("\r\n|\r|\n|\\s+|or\\s+|\\s+OR\\s+");
             if (expTokens != null) {
                 for (String t : expTokens) {
                     if (!StringUtils.isBlank(t)) {