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

DS-2831 connections cleanup, context reuse (master)

Browse Source
This commit is contained in:
Arnaud de Bossoreille
2015-10-29 13:51:06 +01:00
parent 868120dda4
commit cb34855f20
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
dspace-api/src/main/java/org/dspace/event/EventServiceImpl.java
View File

@@ -292,16 +292,21 @@ public class EventServiceImpl implements EventService
{
Context ctx = new Context();
Dispatcher dispatcher = pooledDispatcher.getObject();
try {
Dispatcher dispatcher = pooledDispatcher.getObject();
for (Iterator ci = dispatcher.getConsumers()
.iterator(); ci.hasNext();)
{
ConsumerProfile cp = (ConsumerProfile) ci.next();
if (cp != null)
for (Iterator ci = dispatcher.getConsumers()
.iterator(); ci.hasNext();)
{
cp.getConsumer().finish(ctx);
ConsumerProfile cp = (ConsumerProfile) ci.next();
if (cp != null)
{
cp.getConsumer().finish(ctx);
}
}
} catch (Exception e) {
ctx.abort();
throw e;
}
}

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

@@ -628,6 +628,8 @@ public class BitstreamResource extends Resource
log.trace("Deleting bitstream from all bundles.");
bitstreamService.delete(context, dspaceBitstream);
context.complete();
}
catch (SQLException e)
{

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

@@ -518,6 +518,8 @@ public class CollectionsResource extends Resource
collectionService.delete(context, dspaceCollection);
collectionService.update(context, dspaceCollection);
context.complete();
}
catch (ContextException e)
{