mirror of
https://gitee.com/chinabugotech/hutool.git
synced 2025-07-21 15:09:48 +08:00
Merge pull request #692 from tellmenow/v5-master
Object的equals方法容易抛空指针异常,用java8的Objects.equals替换
This commit is contained in:
@@ -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)) {
|
||||
|
Reference in New Issue
Block a user