zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
looly
2021-12-12 12:09:35 +08:00
parent 60901d5815
commit fae914cf48
4 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@@ -8,7 +8,8 @@
### 🐣新特性
### 🐞Bug修复
* 【core 】 LineReadWatcher#onModify文件清空判断问题（issue#2013@Github）
* 【core 】 修复4位bytes转换float问题（issue#I4M0E4@Github）
* 【core 】 修复4位bytes转换float问题（issue#I4M0E4@Gitee）
* 【core 】 修复CharSequenceUtil.replace问题（issue#I4M16G@Gitee）
-------------------------------------------------------------------------------------------------------------
# 5.7.17 (2021-12-09)

5
hutool-core/src/main/java/cn/hutool/core/text/CharSequenceUtil.java
View File

@@ -3538,6 +3538,11 @@ public class CharSequenceUtil {
final int strLength = str.length();
final int searchStrLength = searchStr.length();
if(strLength < searchStrLength){
// issue#I4M16G@Gitee
return str(str);
}
if (fromIndex > strLength) {
return str(str);
} else if (fromIndex < 0) {

26
hutool-core/src/main/java/cn/hutool/core/util/XmlUtil.java
View File

@@ -1499,20 +1499,26 @@ public class XmlUtil {
*/
private void examineNode(Node node, boolean attributesOnly) {
final NamedNodeMap attributes = node.getAttributes();
final int length = attributes.getLength();
for (int i = 0; i < length; i++) {
Node attribute = attributes.item(i);
storeAttribute(attribute);
//noinspection ConstantConditions
if (null != attributes) {
final int length = attributes.getLength();
for (int i = 0; i < length; i++) {
Node attribute = attributes.item(i);
storeAttribute(attribute);
}
}
if (false == attributesOnly) {
final NodeList childNodes = node.getChildNodes();
Node item;
final int childLength = childNodes.getLength();
for (int i = 0; i < childLength; i++) {
item = childNodes.item(i);
if (item.getNodeType() == Node.ELEMENT_NODE)
examineNode(item, false);
//noinspection ConstantConditions
if(null != childNodes){
Node item;
final int childLength = childNodes.getLength();
for (int i = 0; i < childLength; i++) {
item = childNodes.item(i);
if (item.getNodeType() == Node.ELEMENT_NODE)
examineNode(item, false);
}
}
}
}

8
hutool-core/src/test/java/cn/hutool/core/text/CharSequenceUtilTest.java
View File

@@ -14,6 +14,14 @@ public class CharSequenceUtilTest {
Assert.assertEquals("SSMBeryAllen", actual);
}
@Test
public void replaceTest2(){
// https://gitee.com/dromara/hutool/issues/I4M16G
String replace = "#{A}";
String result = CharSequenceUtil.replace(replace, "#{AAAAAAA}", "1");
Assert.assertEquals(replace, result);
}
@Test
public void addPrefixIfNotTest(){
String str = "hutool";