Wrap SQLExceptions in ItemCounter with ItemCountExceptions and wrap ItemCountExceptions in Collection and Community in RuntimeExceptions.

git-svn-id: http://scm.dspace.org/svn/repo/branches/dspace-1_5_x@2339 9c30dcfa-912a-0410-8fc2-9e0234be79fd

dspace-api/src/main/java/org/dspace/browse/ItemCounter.java

@@ -178,6 +178,7 @@ public class ItemCounter
 	 * @param dso
 	 * @return
 	 * @throws ItemCountException
+	 * @throws SQLException 
 	 */
 	public int getCount(DSpaceObject dso)
 		throws ItemCountException
@@ -192,12 +193,22 @@ public class ItemCounter
 		// if we make it this far, we need to manually count
 		if (dso instanceof Collection)
 		{
-			return ((Collection) dso).countItems();
+			try {
+				return ((Collection) dso).countItems();
+			} catch (SQLException e) {
+				log.error("caught exception: ", e);
+				throw new ItemCountException(e);
+			}
 		}
 		
 		if (dso instanceof Community)
 		{
-			return ((Collection) dso).countItems();
+			try {
+				return ((Collection) dso).countItems();
+			} catch (SQLException e) {
+				log.error("caught exception: ", e);
+				throw new ItemCountException(e);
+			}
 		}
 		
 		return 0;

dspace-api/src/main/java/org/dspace/content/Collection.java

@@ -1065,7 +1065,7 @@ public class Collection extends DSpaceObject
         {
         	// FIXME: upside down exception handling due to lack of good
         	// exception framework
-        	throw new SQLException(e);
+        	throw new RuntimeException(e.getMessage(), e);
         }
         
         // Delete collection row

dspace-api/src/main/java/org/dspace/content/Community.java

@@ -918,7 +918,7 @@ public class Community extends DSpaceObject
         {
         	// FIXME: upside down exception handling due to lack of good
         	// exception framework
-        	throw new SQLException(e);
+        	throw new RuntimeException(e.getMessage(),e);
         }
         
         // Delete community row