You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2014/12/03 13:05:37 UTC
marmotta git commit: some more defensive code for debugging low level
issues on kiwi
Repository: marmotta
Updated Branches:
refs/heads/develop 73503886c -> 69edbe33d
some more defensive code for debugging low level issues on kiwi
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/69edbe33
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/69edbe33
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/69edbe33
Branch: refs/heads/develop
Commit: 69edbe33d683d38db01e7effdb7e04eea64c7148
Parents: 7350388
Author: Sergio Fernández <wi...@apache.org>
Authored: Wed Dec 3 13:05:25 2014 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Wed Dec 3 13:05:25 2014 +0100
----------------------------------------------------------------------
.../java/org/apache/marmotta/kiwi/sparql/builder/SQLBuilder.java | 2 +-
.../java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/69edbe33/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/SQLBuilder.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/SQLBuilder.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/SQLBuilder.java
index 062ea1c..fb6d60a 100644
--- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/SQLBuilder.java
+++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/SQLBuilder.java
@@ -702,7 +702,7 @@ public class SQLBuilder {
for(String v : bindings.getBindingNames()) {
SQLVariable sv = variables.get(v);
- if(!sv.getExpressions().isEmpty()) {
+ if(sv != null && !sv.getExpressions().isEmpty()) {
List<String> vNames = sv.getExpressions();
String vName = vNames.get(0);
Value binding = converter.convert(bindings.getValue(v));
http://git-wip-us.apache.org/repos/asf/marmotta/blob/69edbe33/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java
index 650892d..128514d 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java
@@ -1853,7 +1853,7 @@ public class KiWiConnection implements AutoCloseable {
cacheNode(result);
return result;
} else {
- throw new IllegalArgumentException("unknown node type in database result: "+ntype);
+ throw new IllegalArgumentException("unknown node type in database result for node id " + id + ": " + ntype);
}
}