Skip to content

Lazily allocate HashMap in PathMatchingHttpServletRequestWrapper #11142

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

Closed
dougqh wants to merge 1 commit into from
+26 −12
Closed

Lazily allocate HashMap in PathMatchingHttpServletRequestWrapper #11142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 13 additions & 6 deletions ...n/java/datadog/trace/instrumentation/springweb/PathMatchingHttpServletRequestWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,35 @@
import javax.servlet.http.HttpServletRequestWrapper;

class PathMatchingHttpServletRequestWrapper extends HttpServletRequestWrapper {
private final Map<String, Object> localAttributes = new HashMap<>();
private Map<String, Object> localAttributes;

public PathMatchingHttpServletRequestWrapper(HttpServletRequest request) {
super(request);
}

@Override
public Object getAttribute(String name) {
final Object ret = localAttributes.get(name);
if (ret == null) {
return super.getAttribute(name);
if (localAttributes != null) {
final Object ret = localAttributes.get(name);
if (ret != null) {
return ret;
}
}
return ret;
return super.getAttribute(name);
}

@Override
public void setAttribute(String name, Object o) {
if (localAttributes == null) {
localAttributes = new HashMap<>();
}
localAttributes.put(name, o);
}

@Override
public void removeAttribute(String name) {
localAttributes.remove(name);
if (localAttributes != null) {
localAttributes.remove(name);
}
}
}
19 changes: 13 additions & 6 deletions ...ava17/datadog/trace/instrumentation/springweb6/PathMatchingHttpServletRequestWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,35 @@
import java.util.Map;

class PathMatchingHttpServletRequestWrapper extends HttpServletRequestWrapper {
private final Map<String, Object> localAttributes = new HashMap<>();
private Map<String, Object> localAttributes;

public PathMatchingHttpServletRequestWrapper(HttpServletRequest request) {
super(request);
}

@Override
public Object getAttribute(String name) {
final Object ret = localAttributes.get(name);
if (ret == null) {
return super.getAttribute(name);
if (localAttributes != null) {
final Object ret = localAttributes.get(name);
if (ret != null) {
return ret;
}
}
return ret;
return super.getAttribute(name);
}

@Override
public void setAttribute(String name, Object o) {
if (localAttributes == null) {
localAttributes = new HashMap<>();
}
localAttributes.put(name, o);
}

@Override
public void removeAttribute(String name) {
localAttributes.remove(name);
if (localAttributes != null) {
localAttributes.remove(name);
}
}
}
Loading