lsm/sa-token
1
0
Fork 0
mirror of https://gitee.com/dromara/sa-token.git synced 2025-05-03 20:27:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复 SaSession 对象中 TokenSign 判断有可能空指针的问题

Browse Source
This commit is contained in:
click33 2022-08-08 03:33:04 +08:00
parent 751cc580b8
commit c4c88105c0
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sa-token-core/src/main/java/cn/dev33/satoken/session/SaSession.java
View File

@ -153,7 +153,7 @@ public class SaSession implements Serializable {
// 返回筛选后的
List<TokenSign> list = new ArrayList<>();
for (TokenSign tokenSign : tokenSignListCopy()) {
if(tokenSign.getDevice().equals(device)) {
if(SaFoxUtil.equals(tokenSign.getDevice(), device)) {
list.add(tokenSign);
}
}
@ -168,7 +168,7 @@ public class SaSession implements Serializable {
*/
public TokenSign getTokenSign(String tokenValue) {
for (TokenSign tokenSign : tokenSignListCopy()) {
if (tokenSign.getValue().equals(tokenValue)) {
if (SaFoxUtil.equals(tokenSign.getValue(), tokenValue)) {
return tokenSign;
}
}

10
sa-token-core/src/main/java/cn/dev33/satoken/util/SaFoxUtil.java
View File

@ -75,6 +75,16 @@ public class SaFoxUtil {
return isEmpty(str) == false;
}
/**
* 比较两个对象是否相等
* @param a 第一个对象
* @param b 第二个对象
* @return 两个对象是否相等
*/
public static boolean equals(Object a, Object b) {
return (a == b) || (a != null && a.equals(b));
}
/**
* 以当前时间戳和随机int数字拼接一个随机字符串
*