From d98d07e898fd63f2cf61baf3d86d7e9864ee4fd5 Mon Sep 17 00:00:00 2001 From: Mark Diggory Date: Wed, 14 May 2008 18:17:48 +0000 Subject: [PATCH] PRotect against null pointer when bitstrema has no name. See: http://sourceforge.net/tracker/index.php?func=detail&aid=1939278&group_id=19984&atid=119984 git-svn-id: http://scm.dspace.org/svn/repo/branches/dspace-1_5_x@2932 9c30dcfa-912a-0410-8fc2-9e0234be79fd --- .../dspace/app/xmlui/cocoon/BitstreamReader.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/BitstreamReader.java b/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/BitstreamReader.java index 4e777e7f0e..a0b78f9ba1 100644 --- a/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/BitstreamReader.java +++ b/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/BitstreamReader.java @@ -291,13 +291,15 @@ public class BitstreamReader extends AbstractReader implements Recyclable this.bitstreamName = bitstream.getName(); // Trim any path information from the bitstream - int finalSlashIndex = bitstreamName.lastIndexOf("/"); - if (finalSlashIndex > 0) - { - bitstreamName = bitstreamName.substring(finalSlashIndex+1); - } - - + if (bitstreamName != null) + { + int finalSlashIndex = bitstreamName.lastIndexOf("/"); + if (finalSlashIndex > 0) + { + bitstreamName = bitstreamName.substring(finalSlashIndex+1); + } + } + // Log that the bitstream has been viewed. log.info(LogManager.getHeader(context, "view_bitstream", "bitstream_id=" + bitstream.getID())); }