Skip to content

Commit d1f7dd1

Browse files
committed
Avoid NPE when enumerating servlet headers
1 parent fef9d16 commit d1f7dd1

File tree

1 file changed

+6
-2
lines changed
  • dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3

1 file changed

+6
-2
lines changed

dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/HttpServletExtractAdapter.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
package datadog.trace.instrumentation.servlet3;
22

3+
import static java.util.Collections.emptyEnumeration;
4+
import static java.util.Collections.enumeration;
5+
36
import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
4-
import java.util.Collections;
7+
import java.util.Collection;
58
import java.util.Enumeration;
69
import javax.servlet.http.HttpServletRequest;
710
import javax.servlet.http.HttpServletResponse;
@@ -41,7 +44,8 @@ public static final class Response extends HttpServletExtractAdapter<HttpServlet
4144

4245
@Override
4346
Enumeration<String> getHeaderNames(HttpServletResponse response) {
44-
return Collections.enumeration(response.getHeaderNames());
47+
final Collection<String> headerNames = response.getHeaderNames();
48+
return headerNames != null ? enumeration(headerNames) : emptyEnumeration();
4549
}
4650

4751
@Override

0 commit comments

Comments
 (0)