You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ss...@apache.org on 2013/07/29 18:18:09 UTC
git commit: try fixing MARMOTTA-280
Updated Branches:
refs/heads/develop e7f512ec8 -> 4a25be776
try fixing MARMOTTA-280
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/4a25be77
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/4a25be77
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/4a25be77
Branch: refs/heads/develop
Commit: 4a25be776a5a98374c7f5cc62b6429258d0d82f3
Parents: e7f512e
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Mon Jul 29 18:18:00 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Mon Jul 29 18:18:00 2013 +0200
----------------------------------------------------------------------
.../marmotta/kiwi/sparql/persistence/KiWiSparqlConnection.java | 4 ++--
.../platform/sparql/services/sparql/SparqlServiceImpl.java | 6 ++++++
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4a25be77/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/persistence/KiWiSparqlConnection.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/persistence/KiWiSparqlConnection.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/persistence/KiWiSparqlConnection.java
index fc2ea0e..4ca85e8 100644
--- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/persistence/KiWiSparqlConnection.java
+++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/persistence/KiWiSparqlConnection.java
@@ -334,10 +334,10 @@ public class KiWiSparqlConnection {
// materialize result to avoid having more than one result set open at the same time
return new CloseableIteratorIteration<BindingSet, SQLException>(Iterations.asList(it).iterator());
- } catch (InterruptedException e) {
+ } catch (InterruptedException | CancellationException e) {
log.info("SPARQL query execution cancelled");
queryStatement.cancel();
- throw e;
+ throw new InterruptedException("SPARQL query execution cancelled");
} catch (ExecutionException e) {
log.error("error executing SPARQL query",e);
throw new SQLException("error executing SPARQL query",e);
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4a25be77/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparql/SparqlServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparql/SparqlServiceImpl.java b/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparql/SparqlServiceImpl.java
index 4db8d1a..ba3ab5a 100644
--- a/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparql/SparqlServiceImpl.java
+++ b/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparql/SparqlServiceImpl.java
@@ -141,6 +141,9 @@ public class SparqlServiceImpl implements SparqlService {
}
connection.commit();
+ } catch (Exception ex) {
+ connection.rollback();
+ throw ex;
} finally {
connection.close();
}
@@ -204,6 +207,9 @@ public class SparqlServiceImpl implements SparqlService {
}
connection.commit();
+ } catch (Exception ex) {
+ connection.rollback();
+ throw ex;
} finally {
connection.close();
}