#240 NP Exception

actiontech · Aug 31, 2017 · 59ead96 · 59ead96
1 parent 11f2363
commit 59ead96
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/main/java/io/mycat/backend/mysql/nio/handler/util/HandlerTool.java b/src/main/java/io/mycat/backend/mysql/nio/handler/util/HandlerTool.java
@@ -270,10 +270,12 @@ public static int findField(Item sel, List<Field> fields, int startIndex) {
             // field.name==null if '' push down
             String colName2 = field.getName() == null ? null : field.getName().trim();
             String tableName2 = field.getTable();
-            if (sel instanceof ItemField && !((StringUtil.isEmpty(tableName) && StringUtil.isEmpty(tableName2)) || tableName.equals(tableName2)))
+            if (sel instanceof ItemField && !StringUtil.equals(tableName, tableName2)) {
                 continue;
-            if (selName.equalsIgnoreCase(colName2))
+            }
+            if (selName.equalsIgnoreCase(colName2)) {
                 return index;
+            }
         }
         return -1;
     }