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/11/16 01:14:51 UTC
git commit: replace null characters in strings with empty string
Updated Branches:
refs/heads/develop 0ad4b9796 -> ca7c2ab20
replace null characters in strings with empty string
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/ca7c2ab2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/ca7c2ab2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/ca7c2ab2
Branch: refs/heads/develop
Commit: ca7c2ab202ebf8ab73b5e4359fa74e4c6ae15af6
Parents: 0ad4b97
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Sat Nov 16 01:14:46 2013 +0100
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Sat Nov 16 01:14:46 2013 +0100
----------------------------------------------------------------------
.../marmotta/kiwi/loader/generic/KiWiHandler.java | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ca7c2ab2/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/generic/KiWiHandler.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/generic/KiWiHandler.java b/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/generic/KiWiHandler.java
index 1013e89..80e797f 100644
--- a/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/generic/KiWiHandler.java
+++ b/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/generic/KiWiHandler.java
@@ -254,10 +254,10 @@ public class KiWiHandler implements RDFHandler {
// differentiate between the different types of the value
if (type == null) {
// FIXME: MARMOTTA-39 (this is to avoid a NullPointerException in the following if-clauses)
- result = connection.loadLiteral(value.toString(), lang, rtype);
+ result = connection.loadLiteral(sanitizeString(value.toString()), lang, rtype);
if(result == null) {
- result = new KiWiStringLiteral(value.toString(), locale, rtype);
+ result = new KiWiStringLiteral(sanitizeString(value.toString()), locale, rtype);
}
} else if(type.equals(Namespaces.NS_XSD+"dateTime")) {
// parse if necessary
@@ -293,10 +293,10 @@ public class KiWiHandler implements RDFHandler {
result= new KiWiBooleanLiteral(bvalue, rtype);
}
} else {
- result = connection.loadLiteral(value.toString(), lang, rtype);
+ result = connection.loadLiteral(sanitizeString(value.toString()), lang, rtype);
if(result == null) {
- result = new KiWiStringLiteral(value.toString(), locale, rtype);
+ result = new KiWiStringLiteral(sanitizeString(value.toString()), locale, rtype);
}
}
} catch(IllegalArgumentException ex) {
@@ -304,10 +304,10 @@ public class KiWiHandler implements RDFHandler {
log.warn("malformed argument for typed literal of type {}: {}", rtype.stringValue(), value);
KiWiUriResource mytype = createURI(Namespaces.NS_XSD+"string");
- result = connection.loadLiteral(value.toString(), lang, mytype);
+ result = connection.loadLiteral(sanitizeString(value.toString()), lang, mytype);
if(result == null) {
- result = new KiWiStringLiteral(value.toString(), locale, mytype);
+ result = new KiWiStringLiteral(sanitizeString(value.toString()), locale, mytype);
}
}
@@ -398,4 +398,10 @@ public class KiWiHandler implements RDFHandler {
@Override
public void handleComment(String comment) throws RDFHandlerException {
}
+
+
+ private static String sanitizeString(String in) {
+ // clean up illegal characters
+ return in.replaceAll("[\\00]","");
+ }
}