From 6b83de1b51f2a1668f9a58605715e108ef08ba59 Mon Sep 17 00:00:00 2001
From: Peter Dietz <peter@longsight.com>
Date: Mon, 6 Oct 2014 20:41:20 -0400
Subject: [PATCH] Remove extra context.aborts in various rest helpers

---
 .../src/main/java/org/dspace/rest/BitstreamResource.java     | 4 ----
 .../src/main/java/org/dspace/rest/CollectionsResource.java   | 4 ----
 .../src/main/java/org/dspace/rest/CommunitiesResource.java   | 4 ----
 dspace-rest/src/main/java/org/dspace/rest/ItemsResource.java | 4 ----
 dspace-rest/src/main/java/org/dspace/rest/Resource.java      | 5 -----
 5 files changed, 21 deletions(-)

diff --git a/dspace-rest/src/main/java/org/dspace/rest/BitstreamResource.java b/dspace-rest/src/main/java/org/dspace/rest/BitstreamResource.java
index 7292ff4d4b..237b1b6239 100644
--- a/dspace-rest/src/main/java/org/dspace/rest/BitstreamResource.java
+++ b/dspace-rest/src/main/java/org/dspace/rest/BitstreamResource.java
@@ -850,10 +850,6 @@ public class BitstreamResource extends Resource
         {
             processException("Something get wrong while finding bitstream. SQLException, Message:" + e, context);
         }
-        finally
-        {
-            context.abort();
-        }
         return bitstream;
     }
 }
diff --git a/dspace-rest/src/main/java/org/dspace/rest/CollectionsResource.java b/dspace-rest/src/main/java/org/dspace/rest/CollectionsResource.java
index f390ebd50b..bb12d1e346 100644
--- a/dspace-rest/src/main/java/org/dspace/rest/CollectionsResource.java
+++ b/dspace-rest/src/main/java/org/dspace/rest/CollectionsResource.java
@@ -776,10 +776,6 @@ public class CollectionsResource extends Resource
         {
             processException("Something get wrong while finding collection(id=" + id + "). SQLException, Message: " + e, context);
         }
-        finally
-        {
-            context.abort();
-        }
         return collection;
     }
 }
diff --git a/dspace-rest/src/main/java/org/dspace/rest/CommunitiesResource.java b/dspace-rest/src/main/java/org/dspace/rest/CommunitiesResource.java
index 4d55131452..ba45031a04 100644
--- a/dspace-rest/src/main/java/org/dspace/rest/CommunitiesResource.java
+++ b/dspace-rest/src/main/java/org/dspace/rest/CommunitiesResource.java
@@ -1089,10 +1089,6 @@ public class CommunitiesResource extends Resource
         {
             processException("Something get wrong while finding community(id=" + id + "). SQLException, Message:" + e, context);
         }
-        finally
-        {
-            context.abort();
-        }
         return community;
     }
 }
diff --git a/dspace-rest/src/main/java/org/dspace/rest/ItemsResource.java b/dspace-rest/src/main/java/org/dspace/rest/ItemsResource.java
index 122e498d8e..db4d852738 100644
--- a/dspace-rest/src/main/java/org/dspace/rest/ItemsResource.java
+++ b/dspace-rest/src/main/java/org/dspace/rest/ItemsResource.java
@@ -1095,10 +1095,6 @@ public class ItemsResource extends Resource
         {
             processException("Something get wrong while finding item(id=" + id + "). SQLException, Message: " + e, context);
         }
-        finally
-        {
-            context.abort();
-        }
         return item;
     }
 }
diff --git a/dspace-rest/src/main/java/org/dspace/rest/Resource.java b/dspace-rest/src/main/java/org/dspace/rest/Resource.java
index 6cb46e1f7d..f98c0320bb 100644
--- a/dspace-rest/src/main/java/org/dspace/rest/Resource.java
+++ b/dspace-rest/src/main/java/org/dspace/rest/Resource.java
@@ -136,11 +136,6 @@ public class Resource
         {
             processException("Could not write usageEvent, ContextException. Message: " + e.getMessage(), context);
         }
-        finally
-        {
-            context.abort();
-        }
-
     }
 
     /**