Skip to content

Commit a9889cc

Browse files
committed
Prepare release
2 parents b8c0157 + 93198a4 commit a9889cc

File tree

54 files changed

+567
-261
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+567
-261
lines changed

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,19 @@
33

44
-------------------------------------------------------------------------------------------------------------
55

6+
## 4.4.4
7+
8+
### 新特性
9+
* 【crypto】 增加EC公钥压缩/解压缩(pr#264@Github)
10+
* 【db】 Entity支持IS NOT NULL形式,调整逻辑,强化Condition的toString(issue#267@Github)
11+
12+
### Bug修复
13+
* 【core】 修复Profile中路径参数失效问题(issue#265@Github)
14+
* 【core】 修复Profile中路径参数失效问题
15+
* 【core】 修复MapConvert中值类型转换错误的问题(issue#268@Github)
16+
17+
-------------------------------------------------------------------------------------------------------------
18+
619
## 4.4.3
720

821
### 新特性

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,21 +86,21 @@ Hutool是Hu + tool的自造词,谐音“糊涂”,寓意追求“万事都
8686
<dependency>
8787
<groupId>cn.hutool</groupId>
8888
<artifactId>hutool-all</artifactId>
89-
<version>4.4.3</version>
89+
<version>4.4.4</version>
9090
</dependency>
9191
```
9292

9393
### Gradle
9494
```
95-
compile 'cn.hutool:hutool-all:4.4.3'
95+
compile 'cn.hutool:hutool-all:4.4.4'
9696
```
9797

9898
### 非Maven项目
9999

100100
点击以下任一链接,下载`hutool-all-X.X.X.jar`即可:
101101

102-
- [Maven中央库1](https://repo1.maven.org/maven2/cn/hutool/hutool-all/4.4.3/)
103-
- [Maven中央库2](http://repo2.maven.org/maven2/cn/hutool/hutool-all/4.4.3/)
102+
- [Maven中央库1](https://repo1.maven.org/maven2/cn/hutool/hutool-all/4.4.4/)
103+
- [Maven中央库2](http://repo2.maven.org/maven2/cn/hutool/hutool-all/4.4.4/)
104104

105105
> 注意
106106
> Hutool只支持JDK7+,对应Android平台没有测试,部分方法并不支持。

docs/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<div class="js-fullheight-home fh5co-copy-inner">
6161
<h1>
6262
<b style="font-size: 180%;margin-left:-10px">Hutool</b>
63-
<span style="font-size: 35%">v4.4.3</span>
63+
<span style="font-size: 35%">v4.4.4</span>
6464
</h1>
6565
<h2>A set of tools that keep Java sweet.</h2>
6666
<div style="margin-top: 100px">
@@ -143,12 +143,12 @@ <h2>A set of tools that keep Java sweet.</h2>
143143
<code>&lt;dependency&gt;
144144
&lt;groupId&gt;cn.hutool&lt;/groupId&gt;
145145
&lt;artifactId&gt;hutool-all&lt;/artifactId&gt;
146-
&lt;version&gt;4.4.3&lt;/version&gt;
146+
&lt;version&gt;4.4.4&lt;/version&gt;
147147
&lt;/dependency&gt;</code>
148148
</pre>
149149
<div>Gradle:</div>
150150
<pre style="background: none; padding: 0;margin: 0;border: none;">
151-
<code>compile 'cn.hutool:hutool-all:4.4.3'</code>
151+
<code>compile 'cn.hutool:hutool-all:4.4.4'</code>
152152
</pre>
153153
<p>
154154
<a href="http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22hutool-all%22" class="btn btn-primary btn-outline" target="_blank">从Maven安装</a>

hutool-all/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>cn.hutool</groupId>
99
<artifactId>hutool-parent</artifactId>
10-
<version>4.4.3</version>
10+
<version>4.4.4</version>
1111
</parent>
1212

1313
<artifactId>hutool-all</artifactId>

hutool-aop/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>cn.hutool</groupId>
1111
<artifactId>hutool-parent</artifactId>
12-
<version>4.4.3</version>
12+
<version>4.4.4</version>
1313
</parent>
1414

1515
<artifactId>hutool-aop</artifactId>

hutool-bloomFilter/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>cn.hutool</groupId>
99
<artifactId>hutool-parent</artifactId>
10-
<version>4.4.3</version>
10+
<version>4.4.4</version>
1111
</parent>
1212

1313
<artifactId>hutool-bloomFilter</artifactId>

hutool-cache/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>cn.hutool</groupId>
99
<artifactId>hutool-parent</artifactId>
10-
<version>4.4.3</version>
10+
<version>4.4.4</version>
1111
</parent>
1212

1313
<artifactId>hutool-cache</artifactId>

hutool-captcha/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>cn.hutool</groupId>
99
<artifactId>hutool-parent</artifactId>
10-
<version>4.4.3</version>
10+
<version>4.4.4</version>
1111
</parent>
1212

1313
<artifactId>hutool-captcha</artifactId>

hutool-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>cn.hutool</groupId>
1111
<artifactId>hutool-parent</artifactId>
12-
<version>4.4.3</version>
12+
<version>4.4.4</version>
1313
</parent>
1414

1515
<artifactId>hutool-core</artifactId>

hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1660,7 +1660,7 @@ public static <T> Collection<T> addAll(Collection<T> collection, Object value, T
16601660
elementType = Object.class;
16611661
} else {
16621662
final Class<?> elementRowType = TypeUtil.getClass(elementType);
1663-
if (elementRowType.isInstance(value) && false == Iterable.class.isAssignableFrom(elementRowType)) {
1663+
if (null != elementRowType && (elementRowType.isInstance(value) && false == Iterable.class.isAssignableFrom(elementRowType))) {
16641664
// 其它类型按照单一元素处理
16651665
collection.add((T) value);
16661666
return collection;

0 commit comments

Comments
 (0)