From 5761df3bcc525d8b0b36bd40cdffcd573234abf0 Mon Sep 17 00:00:00 2001
From: Stuart Lewis <stuart@stuartlewis.com>
Date: Mon, 15 Dec 2008 16:51:13 +0000
Subject: [PATCH] Patch for SF bug #2016130 checksum checker can not retrieve
 very large bitstream

git-svn-id: http://scm.dspace.org/svn/repo/branches/dspace-1_5_x@3332 9c30dcfa-912a-0410-8fc2-9e0234be79fd
---
 .../src/main/java/org/dspace/checker/BitstreamInfo.java   | 4 ++--
 .../main/java/org/dspace/checker/BitstreamInfoDAO.java    | 6 +++---
 .../main/java/org/dspace/checker/DSpaceBitstreamInfo.java | 8 ++++----
 dspace/CHANGES                                            | 2 ++
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/dspace-api/src/main/java/org/dspace/checker/BitstreamInfo.java b/dspace-api/src/main/java/org/dspace/checker/BitstreamInfo.java
index b4be17c885..ddb3fd962a 100644
--- a/dspace-api/src/main/java/org/dspace/checker/BitstreamInfo.java
+++ b/dspace-api/src/main/java/org/dspace/checker/BitstreamInfo.java
@@ -141,7 +141,7 @@ public final class BitstreamInfo
      * @param procStartDate
      *            When the last bitstream check started.
      */
-    public BitstreamInfo(boolean del, int storeNo, int sz, String bitstrmFmt,
+    public BitstreamInfo(boolean del, int storeNo, long sz, String bitstrmFmt,
             int bitstrmId, String usrFmtDesc, String intrnlId, String src,
             String chksumAlgorthm, String chksum, String nm, Date procEndDate,
             boolean toBeProc, Date procStartDate)
@@ -204,7 +204,7 @@ public final class BitstreamInfo
      * 
      * @return int
      */
-    public int getSize()
+    public long getSize()
     {
         return dspaceBitstream.getSize();
     }
diff --git a/dspace-api/src/main/java/org/dspace/checker/BitstreamInfoDAO.java b/dspace-api/src/main/java/org/dspace/checker/BitstreamInfoDAO.java
index 2e7423db67..fbba5f5763 100644
--- a/dspace-api/src/main/java/org/dspace/checker/BitstreamInfoDAO.java
+++ b/dspace-api/src/main/java/org/dspace/checker/BitstreamInfoDAO.java
@@ -274,7 +274,7 @@ public final class BitstreamInfoDAO extends DAOSupport
             if (rs.next())
             {
                 info = new BitstreamInfo(rs.getBoolean("deleted"), rs
-                        .getInt("store_number"), rs.getInt("size_bytes"), rs
+                        .getInt("store_number"), rs.getLong("size_bytes"), rs
                         .getString("short_description"), rs
                         .getInt("bitstream_id"), rs
                         .getString("user_format_description"), rs
@@ -546,7 +546,7 @@ public final class BitstreamInfoDAO extends DAOSupport
     /**
      * Get the bitstream ids for a given collection
      * 
-     * @param itemId
+     * @param collectionId The id of the collection
      * @return the list of bitstream ids for this item
      */
     public List getCollectionBitstreams(int collectionId)
@@ -589,7 +589,7 @@ public final class BitstreamInfoDAO extends DAOSupport
     /**
      * Get the bitstream ids for a given community
      * 
-     * @param itemId
+     * @param communityId the community id
      * @return the list of bitstream ids for this item
      */
     public List getCommunityBitstreams(int communityId)
diff --git a/dspace-api/src/main/java/org/dspace/checker/DSpaceBitstreamInfo.java b/dspace-api/src/main/java/org/dspace/checker/DSpaceBitstreamInfo.java
index bea200bc21..f898e499ea 100644
--- a/dspace-api/src/main/java/org/dspace/checker/DSpaceBitstreamInfo.java
+++ b/dspace-api/src/main/java/org/dspace/checker/DSpaceBitstreamInfo.java
@@ -54,7 +54,7 @@ public final class DSpaceBitstreamInfo
     private String name;
 
     /** Stored size of the bitstream. */
-    private int size;
+    private long size;
 
     /** the check sum value stored in the database. */
     private String storedChecksum;
@@ -134,7 +134,7 @@ public final class DSpaceBitstreamInfo
      * @param desc
      *            Bitstream description
      */
-    public DSpaceBitstreamInfo(boolean del, int storeNo, int sz,
+    public DSpaceBitstreamInfo(boolean del, int storeNo, long sz,
             String bitstrmFmt, int bitstrmId, String usrFmtDesc,
             String intrnlId, String src, String chksumAlgorthm, String chksum,
             String nm, String desc)
@@ -199,7 +199,7 @@ public final class DSpaceBitstreamInfo
      * 
      * @return int
      */
-    public int getSize()
+    public long getSize()
     {
         return size;
     }
@@ -210,7 +210,7 @@ public final class DSpaceBitstreamInfo
      * @param size
      *            the bitstream size
      */
-    public void setSize(int size)
+    public void setSize(long size)
     {
         this.size = size;
     }
diff --git a/dspace/CHANGES b/dspace/CHANGES
index cb853d73d0..637677d8cf 100644
--- a/dspace/CHANGES
+++ b/dspace/CHANGES
@@ -15,6 +15,8 @@
  - [2041754] Feature Request #1896717 Registration notification missing information about instance
  - Patch for SF bugs 1775059 and 2352146 2 Authentications with LoginPage cause connection exhaust
 
+(Elliot Metsger)
+ - Patch for SF bug #2016130 checksum checker can not retrieve very large bitstream
 
 1.5.1 final
 ===========