Merge pull request #1293 from andrejpk/andrejpk/mockmvc-error

Resolve NullPointer exception when running under test with MockMvc

Author: littleaj

CHANGELOG.md

@@ -1,5 +1,8 @@
 # CHANGELOG
 
+# Version 2.6.2-BETA.3
+* Fixed NullPointer when testing with MockMvc ([#1281](https://github.com/microsoft/ApplicationInsights-Java/issues/1281))
+
 # Version 2.6.2-BETA.2
 * Fixed retry transmission on client side exception
   ([#1282](https://github.com/microsoft/ApplicationInsights-Java/issues/1282)).

web/src/main/java/com/microsoft/applicationinsights/web/internal/WebRequestTrackingFilter.java

@@ -117,7 +117,7 @@ public final class WebRequestTrackingFilter implements Filter {
      * @throws ServletException Exception that can be thrown from invoking the filters chain.
      */
     public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException {
-        if (req instanceof  HttpServletRequest && res instanceof HttpServletResponse) {
+        if (handler != null && req instanceof  HttpServletRequest && res instanceof HttpServletResponse) {
             HttpServletRequest httpRequest = (HttpServletRequest) req;
             HttpServletResponse httpResponse = (HttpServletResponse) res;
             boolean hasAlreadyBeenFiltered = httpRequest.getAttribute(ALREADY_FILTERED) != null;