Merge pull request #692 from tellmenow/v5-master

Object的equals方法容易抛空指针异常,用java8的Objects.equals替换
This commit is contained in:
Golden Looly
2019-12-30 06:37:37 +08:00
committed by GitHub
11 changed files with 28 additions and 41 deletions

View File

@@ -1,9 +1,6 @@
package cn.hutool.db.sql;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.Set;
import java.util.StringTokenizer;
import java.util.*;
/**
* SQL格式化器 from Hibernate
@@ -129,7 +126,7 @@ public class SqlFormatter {
values();
} else if ("on".equals(this.lcToken)) {
on();
} else if ((this.afterBetween) && (this.lcToken.equals("and"))) {
} else if ((this.afterBetween) && (Objects.equals(this.lcToken,"and"))) {
misc();
this.afterBetween = false;
} else if (LOGICAL.contains(this.lcToken)) {