Skip to content
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

Jump to bottom

[UNDERTOW-1722] Resolve memory leak involving request attributes #942

Merged
merged 2 commits into from Aug 24, 2020
Merged

[UNDERTOW-1722] Resolve memory leak involving request attributes #942

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3765e8
[UNDERTOW-1722]Revert "Revert "Clear the servlet request attributes a…
fl4via May 29, 2020
776928d
[UNDERTOW-1722] Move clearAttributes call to HttpServletRequestImpl.c…
fl4via Jun 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 25 additions & 11 deletions servlet/src/main/java/io/undertow/servlet/spec/HttpServletRequestImpl.java
View file
Open in desktop
Expand Up @@ -682,25 +682,33 @@ public ServletInputStream getInputStream() throws IOException {
}

public void closeAndDrainRequest() throws IOException {
if(reader != null) {
reader.close();
}
if(servletInputStream == null) {
servletInputStream = new ServletInputStreamImpl(this);
try {
if (reader != null) {
reader.close();
}
if (servletInputStream == null) {
servletInputStream = new ServletInputStreamImpl(this);
}
servletInputStream.close();
} finally {
clearAttributes();
}
servletInputStream.close();
}

/**
* Frees any resources (namely buffers) that may be associated with this request.
*
*/
public void freeResources() throws IOException {
if(reader != null) {
reader.close();
}
if(servletInputStream != null) {
servletInputStream.close();
try {
if(reader != null) {
reader.close();
}
if(servletInputStream != null) {
servletInputStream.close();
}
} finally {
clearAttributes();
}
}

Expand Down Expand Up @@ -1188,6 +1196,12 @@ public String toString() {
return "HttpServletRequestImpl [ " + getMethod() + ' ' + getRequestURI() + " ]";
}

public void clearAttributes() {
if(attributes != null) {
this.attributes.clear();
}
}

@Override
public PushBuilder newPushBuilder() {
if(exchange.getConnection().isPushSupported()) {
Expand Down