From c69138b737000d5450246479245e98e1a5f140d6 Mon Sep 17 00:00:00 2001 From: Jim Blake Date: Tue, 31 Mar 2015 17:38:53 -0400 Subject: [PATCH] VIVO-1009 Tweak the handling of TDB transactions. --- .../rdfservice/impl/jena/tdb/RDFServiceTDB.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/tdb/RDFServiceTDB.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/tdb/RDFServiceTDB.java index aaf866431..1e4527e7d 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/tdb/RDFServiceTDB.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/tdb/RDFServiceTDB.java @@ -63,7 +63,6 @@ public class RDFServiceTDB extends RDFServiceJena { return false; } - dataset.begin(ReadWrite.WRITE); try { insureThatInputStreamsAreResettable(changeSet); @@ -72,18 +71,20 @@ public class RDFServiceTDB extends RDFServiceJena { } notifyListenersOfPreChangeEvents(changeSet); - applyChangeSetToModel(changeSet, dataset); - + dataset.begin(ReadWrite.WRITE); + try { + applyChangeSetToModel(changeSet, dataset); + dataset.commit(); + } finally { + dataset.end(); + } + notifyListenersOfChanges(changeSet); notifyListenersOfPostChangeEvents(changeSet); - - dataset.commit(); return true; } catch (Exception e) { log.error(e, e); throw new RDFServiceException(e); - } finally { - dataset.end(); } }