Skip to content
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

DS-3435 possible nullpointerexception at AccessStepUtil$populateEmbar… #1600

Merged
merged 1 commit into from
Jan 10, 2017

Conversation

samuelcambien
Copy link
Contributor

DS-3435: possible nullpointerexception at AccessStepUtil$populateEmbargoDetail (line 250)

The ResourcePolicy$getGroup method documentation states the policy group can be null (which is correct, since the policy can also be defined for a specific eperson), but AccessStepUtil seems to assume it won't be null.

Also, the documentation for ResourcePolicy$getGroup needs to be updated, it mentions group id but the group object is returned instead. Same for setGroup.

…goDetail

Conflicts:
	dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/submission/submit/AccessStepUtil.java
@samuelcambien
Copy link
Contributor Author

also committed to master:

#1599

Copy link
Member

@mwoodiupui mwoodiupui left a comment

Choose a reason for hiding this comment

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

+1 by inspection. Simple and clearly needed.

Copy link
Member

@bram-atmire bram-atmire left a comment

Choose a reason for hiding this comment

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

+1

@bram-atmire
Copy link
Member

@samuelcambien can you recreate the branch or update it, in order to kick off travis again? Travis doesn't seem to complete the build/test here, and it's not clear why.

@tdonohue tdonohue added the bug label Jan 4, 2017
@tdonohue tdonohue added this to the 6.1 milestone Jan 4, 2017
@tomdesair
Copy link
Contributor

The fix has been verified by this user: https://groups.google.com/forum/#!topic/dspace-tech/XYgOSbAtUHE

@tdonohue
Copy link
Member

I'm going to consider this approved, even though Travis stalled on us. It's been verified by a user, and it's identical to #1599. Merging

@tdonohue tdonohue merged commit 958631c into DSpace:dspace-6_x Jan 10, 2017
4science-it pushed a commit to 4Science/DSpace that referenced this pull request Jan 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants