Skip to content

[#16098] Fix resource leaks and improve code quality in ConfigUtils #16097

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DocJlm wants to merge 2 commits into
base: 3.3
Choose a base branch
from
+10 −22
Open

[#16098] Fix resource leaks and improve code quality in ConfigUtils #16097

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cda011c
fix: fix resource leaks and improve code quality in ConfigUtils
DocJlm Feb 21, 2026
b96c4f0
revert StringBuffer change: Matcher.appendReplacement requires String…
DocJlm Feb 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 10 additions & 22 deletions dubbo-common/src/main/java/org/apache/dubbo/common/utils/ConfigUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,13 +213,8 @@ public static Properties loadProperties(
Properties properties = new Properties();
// add scene judgement in windows environment Fix 2557
if (checkFileNameExist(fileName)) {
try {
FileInputStream input = new FileInputStream(fileName);
try {
properties.load(input);
} finally {
input.close();
}
try (FileInputStream input = new FileInputStream(fileName)) {
properties.load(input);
} catch (Throwable e) {
logger.warn(
COMMON_IO_EXCEPTION,
Expand Down Expand Up @@ -279,19 +274,11 @@ public static Properties loadProperties(
logger.info("load " + fileName + " properties file from " + set);

for (java.net.URL url : set) {
try {
Properties p = new Properties();
InputStream input = url.openStream();
try (InputStream input = url.openStream()) {
if (input != null) {
try {
p.load(input);
properties.putAll(p);
} finally {
try {
input.close();
} catch (Throwable t) {
}
}
Properties p = new Properties();
p.load(input);
properties.putAll(p);
}
} catch (Throwable e) {
logger.warn(
Expand Down Expand Up @@ -331,9 +318,10 @@ public static String loadMigrationRule(Set<ClassLoader> classLoaders, String fil
for (Set<URL> urls : ClassLoaderResourceLoader.loadResources(fileName, classLoadersToLoad)
.values()) {
for (URL url : urls) {
InputStream is = url.openStream();
if (is != null) {
return readString(is);
try (InputStream is = url.openStream()) {
if (is != null) {
return readString(is);
}
}
}
}
Expand Down
Loading