hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-10 19:43:10 +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

59
dspace-rest/src/main/java/org/dspace/rest/BitstreamResource.java
View File

@@ -120,7 +120,11 @@ public class BitstreamResource extends Resource
}
finally
{
context.abort();
if((context != null) && (context.isValid()))
{
log.error("Something get wrong. Aborting context in finally statement.");
context.abort();
}
}
return bitstream;
@@ -181,7 +185,11 @@ public class BitstreamResource extends Resource
}
finally
{
context.abort();
if((context != null) && (context.isValid()))
{
log.error("Something get wrong. Aborting context in finally statement.");
context.abort();
}
}
return policies.toArray(new ResourcePolicy[0]);
@@ -261,9 +269,13 @@ public class BitstreamResource extends Resource
}
finally
{
context.abort();
if((context != null) && (context.isValid()))
{
log.error("Something get wrong. Aborting context in finally statement.");
context.abort();
}
}
return bitstreams.toArray(new Bitstream[0]);
}
@@ -339,7 +351,11 @@ public class BitstreamResource extends Resource
}
finally
{
context.abort();
if((context != null) && (context.isValid()))
{
log.error("Something get wrong. Aborting context in finally statement.");
context.abort();
}
}
return null;
@@ -419,7 +435,11 @@ public class BitstreamResource extends Resource
}
finally
{
context.abort();
if((context != null) && (context.isValid()))
{
log.error("Something get wrong. Aborting context in finally statement.");
context.abort();
}
}
return Response.status(Status.OK).build();
}
@@ -547,7 +567,11 @@ public class BitstreamResource extends Resource
}
finally
{
context.abort();
if((context != null) && (context.isValid()))
{
log.error("Something get wrong. Aborting context in finally statement.");
context.abort();
}
}
log.info("Bitstream metadata(id=" + bitstreamId + ") were successfully updated.");
@@ -634,7 +658,11 @@ public class BitstreamResource extends Resource
}
finally
{
context.abort();
if((context != null) && (context.isValid()))
{
log.error("Something get wrong. Aborting context in finally statement.");
context.abort();
}
}
log.info("Bitstream(id=" + bitstreamId + ") data was successfully updated.");
@@ -709,9 +737,13 @@ public class BitstreamResource extends Resource
}
finally
{
context.abort();
if((context != null) && (context.isValid()))
{
log.error("Something get wrong. Aborting context in finally statement.");
context.abort();
}
}
log.info("Bitstream(id=" + bitstreamId + ") was successfully deleted.");
return Response.ok().build();
}
@@ -783,8 +815,13 @@ public class BitstreamResource extends Resource
}
finally
{
context.abort();
if((context != null) && (context.isValid()))
{
log.error("Something get wrong. Aborting context in finally statement.");
context.abort();
}
}
return Response.status(Status.OK).build();
}