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.

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

Fix potential NullPointerException in csv and maxmind data adapters #4912

Merged
merged 1 commit into from Jul 16, 2018

Conversation

Projects
None yet
2 participants
@bernd
Member

bernd commented Jul 16, 2018

Make sure the "fileInfo" field is initialized with an empty FileInfo
object. Also catch all exceptions in FileInfo#forPath instead of
IOExceptions only.

Refs #4748

(cherry picked from commit 7759690)

Fix potential NullPointerException in csv and maxmind data adapters
Make sure the "fileInfo" field is initialized with an empty FileInfo
object. Also catch all exceptions in FileInfo#forPath instead of
IOExceptions only.

Refs #4748

(cherry picked from commit 7759690)

@bernd bernd added this to the 2.4.6 milestone Jul 16, 2018

@dennisoelkers dennisoelkers merged commit 86cc106 into 2.4 Jul 16, 2018

4 of 5 checks passed

ci-web-linter Jenkins build graylog-pr-linter-check 2595 has failed
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
graylog-project/pr Jenkins build graylog-project-pr-snapshot 1567 has succeeded
Details
license/cla Contributor License Agreement is signed.
Details

@dennisoelkers dennisoelkers deleted the issue-4748-2.4 branch Jul 16, 2018

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