Skip to content

fix: close InputStreams after StreamUtils.copyToString #41516

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

Merged
wyattwalter merged 6 commits into from
Feb 5, 2026
Merged

fix: close InputStreams after StreamUtils.copyToString #41516

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f6c6322
fix: close InputStream after StreamUtils.copyToString() to prevent re…
aejeong-context Jan 11, 2026
e31104e
fix: close InputStream to prevent resource leaks
aejeong-context Jan 21, 2026
9aaa9a6
Merge remote-tracking branch 'fork/fix/resource-leak-streamutils' int…
aejeong-context Jan 21, 2026
cf8ce75
fix: handle null InputStream when reading README template
aejeong-context Jan 21, 2026
472c368
style: improve readability of exception handling and string replacement
aejeong-context Jan 22, 2026
697f3e5
Merge branch 'appsmithorg:release' into fix/resource-leak-streamutils
aejeong-context Jan 28, 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
9 changes: 6 additions & 3 deletions ...rver/appsmith-server/src/main/java/com/appsmith/server/migrations/DatabaseChangelog2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import org.springframework.util.StreamUtils;

import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.Charset;
import java.time.Instant;
import java.util.HashSet;
Expand Down Expand Up @@ -349,9 +350,11 @@ public void createThemesIndices(MongoTemplate mongoTemplate) {
@ChangeSet(order = "031-a", id = "create-system-themes-v3", author = "", runAlways = true)
public void createSystemThemes3(MongoTemplate mongoTemplate) throws IOException {

final String themesJson = StreamUtils.copyToString(
new DefaultResourceLoader().getResource("system-themes.json").getInputStream(),
Charset.defaultCharset());
final String themesJson;
try (InputStream inputStream =
new DefaultResourceLoader().getResource("system-themes.json").getInputStream()) {
themesJson = StreamUtils.copyToString(inputStream, Charset.defaultCharset());
}

Theme[] themes = new GsonBuilder()
.registerTypeAdapter(Instant.class, new ISOStringToInstantConverter())
Expand Down
4 changes: 2 additions & 2 deletions ...r/appsmith-server/src/main/java/com/appsmith/server/plugins/base/PluginServiceCEImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,8 +466,8 @@ private Map<String, String> loadTemplatesFromPlugin(Plugin plugin) {
? filename.replaceFirst("\\.\\w+$", "")
: template.getTitle();

try {
templates.put(title, StreamUtils.copyToString(resource.getInputStream(), Charset.defaultCharset()));
try (InputStream inputStream = resource.getInputStream()) {
templates.put(title, StreamUtils.copyToString(inputStream, Charset.defaultCharset()));

} catch (IOException e) {
log.error("Error loading template {} for plugin {}", filename, plugin.getId());
Expand Down
8 changes: 6 additions & 2 deletions ...erver/src/main/java/com/appsmith/server/solutions/ce/CreateDBTablePageSolutionCEImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
import reactor.core.scheduler.Schedulers;

import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.Charset;
import java.time.Instant;
import java.util.ArrayList;
Expand Down Expand Up @@ -590,8 +591,11 @@ private ApplicationJson fetchTemplateApplication(String filePath) throws IOExcep
3. Store the data in the application resource format
*/
log.debug("Going to fetch template application");
final String jsonContent = StreamUtils.copyToString(
new DefaultResourceLoader().getResource(filePath).getInputStream(), Charset.defaultCharset());
final String jsonContent;
try (InputStream inputStream =
new DefaultResourceLoader().getResource(filePath).getInputStream()) {
jsonContent = StreamUtils.copyToString(inputStream, Charset.defaultCharset());
}

return gson.fromJson(jsonContent, ApplicationJson.class);
}
Expand Down
7 changes: 5 additions & 2 deletions ...smith-server/src/test/java/com/appsmith/server/git/ServerSchemaMigrationEnforcerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
import reactor.test.StepVerifier;

import java.io.IOException;
import java.io.InputStream;
import java.net.URISyntaxException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Path;
Expand Down Expand Up @@ -283,8 +284,10 @@ public void importApplication_ThenExportApplication_MatchJson_equals_Success() t

@SneakyThrows
private String readResource(String filePath) {
return StreamUtils.copyToString(
new DefaultResourceLoader().getResource(filePath).getInputStream(), StandardCharsets.UTF_8);
try (InputStream inputStream =
new DefaultResourceLoader().getResource(filePath).getInputStream()) {
return StreamUtils.copyToString(inputStream, StandardCharsets.UTF_8);
}
}

private void removeCustomJsLibsEntries(JsonObject applicationObjectNode) {
Expand Down
7 changes: 5 additions & 2 deletions ...ppsmith-server/src/test/java/com/appsmith/server/imports/internal/ImportServiceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@
import reactor.util.function.Tuple3;
import reactor.util.function.Tuple4;

import java.io.InputStream;
import java.net.URISyntaxException;
import java.net.URL;
import java.nio.charset.StandardCharsets;
Expand Down Expand Up @@ -4965,8 +4966,10 @@ public void mergeApplicationJsonWithApplication_WhenNoPermissionToCreatePage_Fai

@SneakyThrows
private String readResource(String filePath) {
return StreamUtils.copyToString(
new DefaultResourceLoader().getResource(filePath).getInputStream(), StandardCharsets.UTF_8);
try (InputStream inputStream =
new DefaultResourceLoader().getResource(filePath).getInputStream()) {
return StreamUtils.copyToString(inputStream, StandardCharsets.UTF_8);
}
}

@Test
Expand Down
7 changes: 5 additions & 2 deletions ...appsmith-server/src/test/java/com/appsmith/server/solutions/PartialImportServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
import reactor.test.StepVerifier;
import reactor.util.function.Tuple3;

import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.time.Instant;
import java.util.HashMap;
Expand Down Expand Up @@ -250,8 +251,10 @@ private Application createGitConnectedApp(String applicationName) {

@SneakyThrows
private String readResource(String filePath) {
return StreamUtils.copyToString(
new DefaultResourceLoader().getResource(filePath).getInputStream(), StandardCharsets.UTF_8);
try (InputStream inputStream =
new DefaultResourceLoader().getResource(filePath).getInputStream()) {
return StreamUtils.copyToString(inputStream, StandardCharsets.UTF_8);
}
}

@Test
Expand Down