Merge pull request #856 from jamesrdf/issues/#25-atomic-update

Fix #25: Execute each sequence of update operations in a single transaction

Author: James Leigh

core/repository/sail/src/main/java/org/eclipse/rdf4j/repository/sail/SailUpdate.java

@@ -24,6 +24,7 @@
 
 /**
  * @author Jeen Broekstra
+ * @author James Leigh
  */
 public class SailUpdate extends AbstractParserUpdate {
 
@@ -51,42 +52,44 @@ public void execute()
 		SailUpdateExecutor executor = new SailUpdateExecutor(con.getSailConnection(), con.getValueFactory(),
 				con.getParserConfig());
 
-		for (UpdateExpr updateExpr : updateExprs) {
+		boolean localTransaction = false;
+		try {
+			if (!getConnection().isActive()) {
+				localTransaction = true;
+				beginLocalTransaction();
+			}
+			for (UpdateExpr updateExpr : updateExprs) {
 
-			Dataset activeDataset = getMergedDataset(datasetMapping.get(updateExpr));
+				Dataset activeDataset = getMergedDataset(datasetMapping.get(updateExpr));
 
-			try {
-				boolean localTransaction = isLocalTransaction();
-				if (localTransaction) {
-					beginLocalTransaction();
+				try {
+					executor.executeUpdate(updateExpr, activeDataset, getBindings(), getIncludeInferred(),
+							getMaxExecutionTime());
 				}
-
-				executor.executeUpdate(updateExpr, activeDataset, getBindings(), getIncludeInferred(),
-						getMaxExecutionTime());
-
-				if (localTransaction) {
-					commitLocalTransaction();
+				catch (RDF4JException e) {
+					logger.warn("exception during update execution: ", e);
+					if (!updateExpr.isSilent()) {
+						throw new UpdateExecutionException(e);
+					}
 				}
-			}
-			catch (RDF4JException e) {
-				logger.warn("exception during update execution: ", e);
-				if (!updateExpr.isSilent()) {
-					throw new UpdateExecutionException(e);
+				catch (IOException e) {
+					logger.warn("exception during update execution: ", e);
+					if (!updateExpr.isSilent()) {
+						throw new UpdateExecutionException(e);
+					}
 				}
 			}
-			catch (IOException e) {
-				logger.warn("exception during update execution: ", e);
-				if (!updateExpr.isSilent()) {
-					throw new UpdateExecutionException(e);
-				}
+
+			if (localTransaction) {
+				commitLocalTransaction();
+				localTransaction = false;
+			}
+		}
+		finally {
+			if (localTransaction) {
+				rollbackLocalTransaction();
 			}
 		}
-	}
-
-	private boolean isLocalTransaction()
-		throws RepositoryException
-	{
-		return !getConnection().isActive();
 	}
 
 	private void beginLocalTransaction()
@@ -101,4 +104,11 @@ private void commitLocalTransaction()
 		getConnection().commit();
 
 	}
+
+	private void rollbackLocalTransaction()
+		throws RepositoryException
+	{
+		getConnection().rollback();
+
+	}
 }