hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-18 07:23:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Repaired finally statements and community.

Browse Source 
Repaired all finally statements. It was rewrited from context.abort to
if condition with check if context is valid. In community was changed
back name of subcommunities.
This commit is contained in:
ctu-developers
2014-10-09 21:40:47 +02:00
parent 12b83b3697
commit 57e72004be
7 changed files with 236 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
dspace-rest/src/main/java/org/dspace/rest/CollectionsResource.java
View File

@@ -116,7 +116,11 @@ public class CollectionsResource extends Resource
}
finally
{
context.abort();
if((context != null) && (context.isValid()))
{
log.error("Something get wrong. Aborting context in finally statement.");
context.abort();
}
}
log.trace("Collection(id=" + collectionId + ") has been successfully read.");
@@ -204,7 +208,11 @@ public class CollectionsResource extends Resource
}
finally
{
context.abort();
if((context != null) && (context.isValid()))
{
log.error("Something get wrong. Aborting context in finally statement.");
context.abort();
}
}
log.trace("All collections were successfully read.");
@@ -292,7 +300,11 @@ public class CollectionsResource extends Resource
}
finally
{
context.abort();
if((context != null) && (context.isValid()))
{
log.error("Something get wrong. Aborting context in finally statement.");
context.abort();
}
}
log.trace("All items in collection(id=" + collectionId + ") were successfully read.");
@@ -398,7 +410,11 @@ public class CollectionsResource extends Resource
}
finally
{
context.abort();
if((context != null) && (context.isValid()))
{
log.error("Something get wrong. Aborting context in finally statement.");
context.abort();
}
}
log.info("Item successfully created in collection(id=" + collectionId + "). Item handle=" + returnItem.getHandle());
@@ -472,7 +488,11 @@ public class CollectionsResource extends Resource
}
finally
{
context.abort();
if((context != null) && (context.isValid()))
{
log.error("Something get wrong. Aborting context in finally statement.");
context.abort();
}
}
log.info("Collection(id=" + collectionId + ") successfully updated.");
@@ -542,7 +562,11 @@ public class CollectionsResource extends Resource
}
finally
{
context.abort();
if((context != null) && (context.isValid()))
{
log.error("Something get wrong. Aborting context in finally statement.");
context.abort();
}
}
log.info("Collection(id=" + collectionId + ") was successfully deleted.");
@@ -648,7 +672,11 @@ public class CollectionsResource extends Resource
}
finally
{
context.abort();
if((context != null) && (context.isValid()))
{
log.error("Something get wrong. Aborting context in finally statement.");
context.abort();
}
}
log.info("Item(id=" + itemId + ") in collection(id=" + collectionId + ") was successfully deleted.");
@@ -712,7 +740,11 @@ public class CollectionsResource extends Resource
}
finally
{
context.abort();
if((context != null) && (context.isValid()))
{
log.error("Something get wrong. Aborting context in finally statement.");
context.abort();
}
}
if (collection == null)