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

[DS-672] Stage 1: throw a descriptive IllegalArgumentException instead of NPE.

Browse Source 
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@6073 9c30dcfa-912a-0410-8fc2-9e0234be79fd
This commit is contained in:
Mark Wood
2011-02-09 19:36:37 +00:00
parent 711a59adfa
commit 70293b3743
1 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
dspace-api/src/main/java/org/dspace/embargo/EmbargoManager.java
View File

@@ -132,20 +132,36 @@ public class EmbargoManager
throws SQLException, AuthorizeException, IOException
{
init();
DCValue terms[] = item.getMetadata(terms_schema, terms_element, terms_qualifier, Item.ANY);
DCValue terms[] = item.getMetadata(terms_schema, terms_element,
terms_qualifier, Item.ANY);
DCDate result = null;
// Its poor form to blindly use an object that could be null...
if(terms != null && terms.length > 0)
if (terms == null)
return null;
result = setter.parseTerms(context, item,
terms.length > 0 ? terms[0].value : null);
if (result == null)
return null;
// new DCDate(non-date String) means toDate() will return null
Date liftDate = result.toDate();
if (liftDate == null)
{
result = setter.parseTerms(context, item, terms.length > 0 ? terms[0].value : null);
throw new IllegalArgumentException(
"Embargo lift date is uninterpretable: "
+ result.toString());
}
// sanity check: do not allow an embargo lift date in the past.
if (result != null && result.toDate().before(new Date()))
if (liftDate.before(new Date()))
{
throw new IllegalArgumentException("Embargo lift date must be in the future, but this is in the past: "+result.toString());
throw new IllegalArgumentException(
"Embargo lift date must be in the future, but this is in the past: "
+ result.toString());
}
return result;
}