ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-05-09 23:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix NPE bug

Browse Source
This commit is contained in:
Looly 2021-06-28 23:22:20 +08:00
parent ffed1d32fd
commit 1472cdc440
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -24,7 +24,8 @@
* 【core 】 修复SqlFormatter部分SQL空指针问题（issue#I3XS44@Gitee） * 【core 】 修复SqlFormatter部分SQL空指针问题（issue#I3XS44@Gitee）
* 【core 】 修复DateRange计算问题（issue#I3Y1US@Gitee） * 【core 】 修复DateRange计算问题（issue#I3Y1US@Gitee）
* 【core 】 修复BeanCopier中setFieldNameEditor失效问题（pr#349@Gitee） * 【core 】 修复BeanCopier中setFieldNameEditor失效问题（pr#349@Gitee）
* 【core 】 修复ArrayUtil.indexOfSub查找bug（pr#349@Gitee） * 【core 】 修复ArrayUtil.indexOfSub查找bug（issue#1683@Github）
* 【core 】 修复Node的权重比较空指针问题（issue#1681@Github）
------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------

10
hutool-core/src/main/java/cn/hutool/core/lang/tree/Node.java
View File

@ -1,5 +1,7 @@
package cn.hutool.core.lang.tree; package cn.hutool.core.lang.tree;
import cn.hutool.core.comparator.CompareUtil;
import java.io.Serializable; import java.io.Serializable;
/** /**
@ -74,11 +76,11 @@ public interface Node<T> extends Comparable<Node<T>>, Serializable {
@SuppressWarnings({"unchecked", "rawtypes", "NullableProblems"}) @SuppressWarnings({"unchecked", "rawtypes", "NullableProblems"})
@Override @Override
default int compareTo(Node node) { default int compareTo(Node node) {
if(null == node){
return 1;
}
final Comparable weight = this.getWeight(); final Comparable weight = this.getWeight();
if (null != weight) {
final Comparable weightOther = node.getWeight(); final Comparable weightOther = node.getWeight();
return weight.compareTo(weightOther); return CompareUtil.compare(weight, weightOther);
}
return 0;
} }
} }

1
hutool-core/src/test/java/cn/hutool/core/lang/tree/TreeBuilderTest.java
View File

@ -12,5 +12,4 @@ public class TreeBuilderTest {
of.build(); of.build();
of.append(new ArrayList<>()); of.append(new ArrayList<>());
} }
} }

5
hutool-core/src/test/java/cn/hutool/core/lang/tree/TreeTest.java
View File

@ -28,7 +28,7 @@ public class TreeTest {
@Test @Test
public void sampleTree() { public void sampleTreeTest() {
List<Tree<String>> treeList = TreeUtil.build(nodeList, "0"); List<Tree<String>> treeList = TreeUtil.build(nodeList, "0");
for (Tree<String> tree : treeList) { for (Tree<String> tree : treeList) {
Assert.assertNotNull(tree); Assert.assertNotNull(tree);
@ -43,7 +43,7 @@ public class TreeTest {
} }
@Test @Test
public void tree() { public void treeTest() {
//配置 //配置
TreeNodeConfig treeNodeConfig = new TreeNodeConfig(); TreeNodeConfig treeNodeConfig = new TreeNodeConfig();
@ -66,5 +66,4 @@ public class TreeTest {
Assert.assertEquals(treeNodes.size(), 2); Assert.assertEquals(treeNodes.size(), 2);
} }
} }