SF patch #1517488 Access Bitstreams in Withdrawn Items SF bug #1408373

git-svn-id: http://scm.dspace.org/svn/repo/trunk@1591 9c30dcfa-912a-0410-8fc2-9e0234be79fd

dspace/CHANGES

@@ -29,6 +29,7 @@
 (Claudia Juergen)
 - SF patch #1514965 fixes SF bug #1505422. fix typo in SQL for item mapper
 - SF patch #1516988  Deleting owner of mapped items SF bug #1196724
+- SF patch #1517488  Access Bitstreams in Withdrawn Items SF bug #1408373
 
 (Richard Jones)
 - SF bug #1515075. minor build file fix to copy correct config file

dspace/src/org/dspace/app/webui/servlet/BitstreamServlet.java

@@ -77,6 +77,7 @@ public class BitstreamServlet extends DSpaceServlet
             SQLException, AuthorizeException
     {
         Bitstream bitstream = null;
+        boolean isWithdrawn = false;
 
         // Get the ID from the URL
         String idString = request.getPathInfo();
@@ -132,6 +133,9 @@ public class BitstreamServlet extends DSpaceServlet
                     return;
                 }
                 
+                // determine whether the item the bitstream belongs to has been withdrawn
+                isWithdrawn = item.isWithdrawn();
+
                 int sid = Integer.parseInt(sequence);
                 boolean found = false;
 
@@ -157,6 +161,8 @@ public class BitstreamServlet extends DSpaceServlet
             }
         }
         
+        if (!isWithdrawn)
+        {
             // Did we get a bitstream?
             if (bitstream != null)
             {
@@ -177,6 +183,7 @@ public class BitstreamServlet extends DSpaceServlet
                 is.close();
                 response.getOutputStream().flush();
             }
+            // display the tombstone instead of the bitstream if the item is withdrawn
             else
             {
                 // No bitstream - we got an invalid ID
@@ -187,4 +194,11 @@ public class BitstreamServlet extends DSpaceServlet
                     Constants.BITSTREAM);
             }
         }
+        else
+        {
+            log.info(LogManager.getHeader(context, "view_bitstream", "item has been withdrawn"));
+            JSPManager.showJSP(request, response, "/tombstone.jsp");
+        }
+       
+    }
 }