Skip to content

Avoid NPE when enumerating servlet headers #10213

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
amarziali merged 1 commit into from
Dec 15, 2025
Merged

Avoid NPE when enumerating servlet headers #10213

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
8 changes: 6 additions & 2 deletions ...t-3.0/src/main/java/datadog/trace/instrumentation/servlet3/HttpServletExtractAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
package datadog.trace.instrumentation.servlet3;

import static java.util.Collections.emptyEnumeration;
import static java.util.Collections.enumeration;

import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
import java.util.Collections;
import java.util.Collection;
import java.util.Enumeration;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Expand Down Expand Up @@ -41,7 +44,8 @@ public static final class Response extends HttpServletExtractAdapter<HttpServlet

@Override
Enumeration<String> getHeaderNames(HttpServletResponse response) {
return Collections.enumeration(response.getHeaderNames());
final Collection<String> headerNames = response.getHeaderNames();
return headerNames != null ? enumeration(headerNames) : emptyEnumeration();
}

@Override
Expand Down