Skip to content

Fix NullPointerException (#1860)#1861

Merged
felixbarny merged 7 commits intoelastic:masterfrom
tobiasstadler:fix-#1860
Jun 24, 2021
Merged

Fix NullPointerException (#1860)#1861
felixbarny merged 7 commits intoelastic:masterfrom
tobiasstadler:fix-#1860

Conversation

@tobiasstadler
Copy link
Contributor

@tobiasstadler tobiasstadler commented Jun 14, 2021 •
edited by zube bot
Loading

What does this PR do?

Fixes #1860

Checklist

  • This is an enhancement of existing features, or a new feature in existing plugins
    • I have updated CHANGELOG.asciidoc
    • I have added tests that prove my fix is effective or that my feature works
    • Added an API method or config option? Document in which version this will be introduced
    • I have made corresponding changes to the documentation
  • This is a bugfix
  • This is a new plugin
    • I have updated CHANGELOG.asciidoc
    • My code follows the style guidelines of this project
    • I have made corresponding changes to the documentation
    • I have added tests that prove my fix is effective or that my feature works
    • New and existing unit tests pass locally with my changes
    • I have updated supported-technologies.asciidoc
    • Added an API method or config option? Document in which version this will be introduced
    • Added an instrumentation plugin? Describe how you made sure that old, non-supported versions are not instrumented by accident.
  • This is something else
@ghost
Copy link

ghost commented Jun 14, 2021 •
edited by ghost
Loading

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: Pull request #1861 updated

  • Start Time: 2021-06-24T08:13:01.170+0000

  • Duration: 51 min 37 sec

  • Commit: 08ef112

Test stats 🧪

Test Results
Failed 0
Passed 2286
Skipped 19
Total 2305

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 2286
Skipped 19
Total 2305

videnkz
videnkz reviewed Jun 17, 2021
View reviewed changes
...ugin/src/main/java/co/elastic/apm/agent/servlet/helper/ServletTransactionCreationHelper.java Outdated
@@ -85,6 +85,10 @@ private boolean isExcluded(String servletPath, @Nullable String pathInfo, @Nulla

@Nullable
public ClassLoader getClassloader(ServletContext servletContext){
Copy link
Contributor

@videnkz videnkz Jun 17, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add please @Nullable annotation on arg
Copy link
Contributor Author

@tobiasstadler tobiasstadler Jun 17, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done
@tobiasstadler
Copy link
Contributor Author

tobiasstadler commented Jun 24, 2021

@kananindzya Anything else I need to change?
@felixbarny felixbarny enabled auto-merge (squash) June 24, 2021 08:12
@felixbarny felixbarny disabled auto-merge June 24, 2021 10:21
@felixbarny felixbarny merged commit 480e39d into elastic:master Jun 24, 2021
@tobiasstadler tobiasstadler deleted the fix-#1860 branch June 24, 2021 10:49
@tobiasstadler
Copy link
Contributor Author

tobiasstadler commented Jun 24, 2021

Thank You!
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

agent-java

3 participants

@tobiasstadler @felixbarny @videnkz