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

Added method for proccessing finally statements.

Browse Source 
Resource.writeStats should not throw exception, because it is not
important to abort method by writings statistic. But must abort own
context.
Added method for processing all finally statements.
Moved return to end of methods.
Repaired some bugs.
This commit is contained in:
ctu-developers
2014-10-13 11:39:09 +02:00
parent 57e72004be
commit 29b1d28566
6 changed files with 115 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -120,11 +120,7 @@ public class BitstreamResource extends Resource
}
finally
{
if((context != null) && (context.isValid()))
{
log.error("Something get wrong. Aborting context in finally statement.");
context.abort();
}
processFinally(context);
}
return bitstream;
@@ -185,11 +181,7 @@ public class BitstreamResource extends Resource
}
finally
{
if((context != null) && (context.isValid()))
{
log.error("Something get wrong. Aborting context in finally statement.");
context.abort();
}
processFinally(context);
}
return policies.toArray(new ResourcePolicy[0]);
@@ -269,11 +261,7 @@ public class BitstreamResource extends Resource
}
finally
{
if((context != null) && (context.isValid()))
{
log.error("Something get wrong. Aborting context in finally statement.");
context.abort();
}
processFinally(context);
}
return bitstreams.toArray(new Bitstream[0]);
@@ -311,6 +299,7 @@ public class BitstreamResource extends Resource
log.info("Reading data of bitstream(id=" + bitstreamId + ").");
org.dspace.core.Context context = null;
InputStream inputStream = null;
try
{
@@ -321,13 +310,10 @@ public class BitstreamResource extends Resource
request);
log.trace("Bitsream(id=" + bitstreamId + ") data was successfully read.");
InputStream inputStream = dspaceBitstream.retrieve();
inputStream = dspaceBitstream.retrieve();
String type = dspaceBitstream.getFormat().getMIMEType();
context.complete();
return Response.ok(inputStream).type(type).build();
}
catch (IOException e)
{
@@ -351,14 +337,10 @@ public class BitstreamResource extends Resource
}
finally
{
if((context != null) && (context.isValid()))
{
log.error("Something get wrong. Aborting context in finally statement.");
context.abort();
}
processFinally(context);
}
return null;
return Response.ok(inputStream).type(type).build();
}
/**
@@ -435,11 +417,7 @@ public class BitstreamResource extends Resource
}
finally
{
if((context != null) && (context.isValid()))
{
log.error("Something get wrong. Aborting context in finally statement.");
context.abort();
}
processFinally(context);
}
return Response.status(Status.OK).build();
}
@@ -567,11 +545,7 @@ public class BitstreamResource extends Resource
}
finally
{
if((context != null) && (context.isValid()))
{
log.error("Something get wrong. Aborting context in finally statement.");
context.abort();
}
processFinally(context);
}
log.info("Bitstream metadata(id=" + bitstreamId + ") were successfully updated.");
@@ -658,11 +632,7 @@ public class BitstreamResource extends Resource
}
finally
{
if((context != null) && (context.isValid()))
{
log.error("Something get wrong. Aborting context in finally statement.");
context.abort();
}
processFinally(context);
}
log.info("Bitstream(id=" + bitstreamId + ") data was successfully updated.");
@@ -737,11 +707,7 @@ public class BitstreamResource extends Resource
}
finally
{
if((context != null) && (context.isValid()))
{
log.error("Something get wrong. Aborting context in finally statement.");
context.abort();
}
processFinally(context);
}
log.info("Bitstream(id=" + bitstreamId + ") was successfully deleted.");
@@ -815,11 +781,7 @@ public class BitstreamResource extends Resource
}
finally
{
if((context != null) && (context.isValid()))
{
log.error("Something get wrong. Aborting context in finally statement.");
context.abort();
}
processFinally(context);
}
return Response.status(Status.OK).build();