Skip to content

Commit

Permalink
fix:fix NullPointerException when properties contain kv with null value.
Browse files Browse the repository at this point in the history
  • Loading branch information
SkyeBeFreeman committed Apr 25, 2024
1 parent 3ddfd85 commit bc228ce
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@
- [feat: support nacos namespace mapping](https://github.com/Tencent/spring-cloud-tencent/pull/1191)
- [fix:fix sct-all wrong spring boot version obtain.](https://github.com/Tencent/spring-cloud-tencent/pull/1204)
- fix:fix restTemplateCustomizer bean conflict causing service to fail to start properly.
- fix:fix NullPointerException when properties contain kv with null value.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@

<properties>
<!-- Project revision -->
<revision>1.13.1-Hoxton.SR12</revision>
<revision>1.13.2-Hoxton.SR12</revision>

<!-- Spring Framework -->
<spring.framework.version>5.2.25.RELEASE</spring.framework.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,11 @@ public static ExecutorService executor() {
* @param ret origin properties map
*/
static void initialize(Map<String, Object> ret) {
for (Map.Entry<String, Object> entry : ret.entrySet()) {
if (entry.getValue() == null) {
ret.put(entry.getKey(), "");
}
}
properties.putAll(ret);
}

Expand All @@ -144,6 +149,9 @@ static Map<String, ConfigPropertyChangeInfo> merge(Map<String, Object> ret) {
ret.keySet().parallelStream().forEach(key -> {
Object oldValue = properties.getIfPresent(key);
Object newValue = ret.get(key);
if (newValue == null) {
newValue = "";
}
if (oldValue != null) {
if (!newValue.equals(oldValue)) {
properties.put(key, newValue);
Expand Down
2 changes: 1 addition & 1 deletion spring-cloud-tencent-dependencies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
</developers>

<properties>
<revision>1.13.1-Hoxton.SR12</revision>
<revision>1.13.2-Hoxton.SR12</revision>

<!-- Dependencies -->
<polaris.version>1.15.0</polaris.version>
Expand Down

0 comments on commit bc228ce

Please sign in to comment.