hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-16 22:43:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

DS-3435 possible nullpointerexception at AccessStepUtil$populateEmbargoDetail

Browse Source
This commit is contained in:
samuel
2017-01-03 12:38:56 +01:00
parent 1137d4562c
commit 9cd511def4
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dspace-api/src/main/java/org/dspace/authorize/ResourcePolicy.java
View File

@@ -218,9 +218,9 @@ public class ResourcePolicy implements ReloadableEntity<Integer> {
} }
/** /**
* 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() public Group getGroup()
{ {
@@ -228,7 +228,7 @@ public class ResourcePolicy implements ReloadableEntity<Integer> {
} }
/** /**
* sets ID for Group referred to by this policy * sets the Group referred to by this policy
* @param epersonGroup Group * @param epersonGroup Group
*/ */
public void setGroup(Group epersonGroup) public void setGroup(Group epersonGroup)

2
dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/submission/submit/AccessStepUtil.java
View File

@@ -247,7 +247,7 @@ public class AccessStepUtil extends AbstractDSpaceTransformer {
private void populateEmbargoDetail(final DSpaceObject dso, final Text text) throws SQLException, WingException { private void populateEmbargoDetail(final DSpaceObject dso, final Text text) throws SQLException, WingException {
for (final ResourcePolicy readPolicy : authorizeService.getPoliciesActionFilter(context, dso, Constants.READ)) 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"); final String dateString = DateFormatUtils.format(readPolicy.getStartDate(), "yyyy-MM-dd");
text.setValue(dateString); text.setValue(dateString);