avoid null pointer when getting email for OAI-PMH #3619 #6538
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it:
This pull request is a follow up to pull request #6513 where I accidentally introduced the chance of 500 errors being thrown at URLs such as http://phoenix.dataverse.org/oai?verb=Indentify when the system email address has not been configured:
Which issue(s) this PR closes:
Closes #3619 (re-closes)
Special notes for your reviewer:
None.
Suggestions on how to test this:
Configure Dataverse with and without a system email, stopping and starting Glassfish in between each configuration change. For both cases, go to a URL such as http://phoenix.dataverse.org/oai?verb=Indentify and make sure a 500 error is not thrown.
When the system email is not configured, you should see something like
<adminEmail/>
(I checked that this is how it works in 4.18.1 so it's the same.).When the system email is configured, only the email address should be shown like this:
<adminEmail>[email protected]</adminEmail>
. As with the the original change in #6513 in order to help OAI-PMH validate, we should never see the "personal" part like `Dataverse Support [email protected].Does this PR introduce a user interface change?:
No.
Is there a release notes update needed for this change?:
No.
Additional documentation:
None.