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

Fix bug introduced by DS-285 changes when accessing Bitstream without Item, i.e. /bitstream/id/NNN

Browse Source 
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@4465 9c30dcfa-912a-0410-8fc2-9e0234be79fd
This commit is contained in:
Larry Stone
2009-10-24 02:46:21 +00:00
parent ffd7c48153
commit 592e70bd60
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/BitstreamReader.java
View File

@@ -516,7 +516,7 @@ public class BitstreamReader extends AbstractReader implements Recyclable
{ {
// Check for if-modified-since header -- ONLY if not authenticated // Check for if-modified-since header -- ONLY if not authenticated
long modSince = request.getDateHeader("If-Modified-Since"); long modSince = request.getDateHeader("If-Modified-Since");
if (modSince != -1 && item.getLastModified().getTime() < modSince) if (modSince != -1 && item != null && item.getLastModified().getTime() < modSince)
{ {
// Item has not been modified since requested date, // Item has not been modified since requested date,
// hence bitstream has not; return 304 // hence bitstream has not; return 304
@@ -531,7 +531,7 @@ public class BitstreamReader extends AbstractReader implements Recyclable
// users in the cache for a response later to anonymous user. // users in the cache for a response later to anonymous user.
try try
{ {
if (isSpider || ContextUtil.obtainContext(request).getCurrentUser() == null) if (item != null && (isSpider || ContextUtil.obtainContext(request).getCurrentUser() == null))
{ {
// TODO: Currently just borrow the date of the item, since // TODO: Currently just borrow the date of the item, since
// we don't have last-mod dates for Bitstreams // we don't have last-mod dates for Bitstreams