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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 1 commit into from Jan 10, 2017
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions dspace-api/src/main/java/org/dspace/authorize/ResourcePolicy.java
View file
Open in desktop
Expand Up @@ -218,17 +218,17 @@ public void setEPerson(EPerson eperson)
}

/**
* gets ID for Group referred to by this policy
* gets the Group referred to by this policy
*
* @return groupID, or null if no group set
* @return group, or null if no group set
*/
public Group getGroup()
{
return epersonGroup;
}

/**
* sets ID for Group referred to by this policy
* sets the Group referred to by this policy
* @param epersonGroup Group
*/
public void setGroup(Group epersonGroup)
Expand Down
2 changes: 1 addition & 1 deletion dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/submission/submit/AccessStepUtil.java
View file
Open in desktop
Expand Up @@ -201,7 +201,7 @@ public void addEmbargoDateDisplayOnly(final DSpaceObject dso, final List list) t

private void populateEmbargoDetail(final DSpaceObject dso, final Text text) throws SQLException, WingException {
for (final ResourcePolicy readPolicy : authorizeService.getPoliciesActionFilter(context, dso, Constants.READ)) {
if (Group.ANONYMOUS.equals(readPolicy.getGroup().getName()) && readPolicy.getStartDate() != null) {
if (readPolicy.getGroup() != null && Group.ANONYMOUS.equals(readPolicy.getGroup().getName()) && readPolicy.getStartDate() != null) {
final String dateString = DateFormatUtils.format(readPolicy.getStartDate(), "yyyy-MM-dd");
text.setValue(dateString);
globalReason = readPolicy.getRpDescription();
Expand Down