You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2017/08/22 13:27:35 UTC
[1/3] jena git commit: Correct media type for Turtle;
have charset once
Repository: jena
Updated Branches:
refs/heads/master 98db31411 -> 116ffb87c
Correct media type for Turtle; have charset once
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/a479626d
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/a479626d
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/a479626d
Branch: refs/heads/master
Commit: a479626d1c56006315a02b0db405f105e4a01d15
Parents: 98db314
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Aug 20 15:03:09 2017 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Aug 20 15:03:09 2017 +0100
----------------------------------------------------------------------
jena-fuseki2/apache-jena-fuseki/bin/s-delete | 5 +++--
jena-fuseki2/apache-jena-fuseki/bin/s-get | 5 +++--
jena-fuseki2/apache-jena-fuseki/bin/s-head | 5 +++--
jena-fuseki2/apache-jena-fuseki/bin/s-post | 5 +++--
jena-fuseki2/apache-jena-fuseki/bin/s-put | 5 +++--
jena-fuseki2/apache-jena-fuseki/bin/s-query | 5 +++--
jena-fuseki2/apache-jena-fuseki/bin/s-update | 5 +++--
jena-fuseki2/apache-jena-fuseki/bin/s-update-form | 5 +++--
jena-fuseki2/apache-jena-fuseki/bin/soh | 5 +++--
9 files changed, 27 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/a479626d/jena-fuseki2/apache-jena-fuseki/bin/s-delete
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/bin/s-delete b/jena-fuseki2/apache-jena-fuseki/bin/s-delete
index dcafe62..9bb7198 100755
--- a/jena-fuseki2/apache-jena-fuseki/bin/s-delete
+++ b/jena-fuseki2/apache-jena-fuseki/bin/s-delete
@@ -42,7 +42,7 @@ $proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
# What about direct naming?
# Names
-$mtTurtle = 'text/turtle;charset=utf-8'
+$mtTurtle = 'text/turtle'
$mtRDF = 'application/rdf+xml'
$mtText = 'text/plain'
$mtNTriples = 'application/n-triples'
@@ -62,7 +62,7 @@ $mtSparqlQuery = "application/sparql-query" ;
# Global media type table.
$fileMediaTypes = {}
$fileMediaTypes['ttl'] = $mtTurtle
-$fileMediaTypes['n3'] = 'text/n3; charset=utf-8'
+$fileMediaTypes['n3'] = 'text/n3'
$fileMediaTypes['nt'] = $mtText
$fileMediaTypes['rdf'] = $mtRDF
$fileMediaTypes['owl'] = $mtRDF
@@ -75,6 +75,7 @@ $fileMediaTypes['jsonld'] = $mtJSONLD
$charsetUTF8 = 'utf-8'
$charset = {}
$charset[$mtTurtle] = 'utf-8'
+$charset['text/n3'] = 'utf-8'
$charset[$mtText] = 'ascii'
$charset[$mtTriG] = 'utf-8'
$charset[$mtNQuads] = 'utf-8'
http://git-wip-us.apache.org/repos/asf/jena/blob/a479626d/jena-fuseki2/apache-jena-fuseki/bin/s-get
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/bin/s-get b/jena-fuseki2/apache-jena-fuseki/bin/s-get
index dcafe62..9bb7198 100755
--- a/jena-fuseki2/apache-jena-fuseki/bin/s-get
+++ b/jena-fuseki2/apache-jena-fuseki/bin/s-get
@@ -42,7 +42,7 @@ $proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
# What about direct naming?
# Names
-$mtTurtle = 'text/turtle;charset=utf-8'
+$mtTurtle = 'text/turtle'
$mtRDF = 'application/rdf+xml'
$mtText = 'text/plain'
$mtNTriples = 'application/n-triples'
@@ -62,7 +62,7 @@ $mtSparqlQuery = "application/sparql-query" ;
# Global media type table.
$fileMediaTypes = {}
$fileMediaTypes['ttl'] = $mtTurtle
-$fileMediaTypes['n3'] = 'text/n3; charset=utf-8'
+$fileMediaTypes['n3'] = 'text/n3'
$fileMediaTypes['nt'] = $mtText
$fileMediaTypes['rdf'] = $mtRDF
$fileMediaTypes['owl'] = $mtRDF
@@ -75,6 +75,7 @@ $fileMediaTypes['jsonld'] = $mtJSONLD
$charsetUTF8 = 'utf-8'
$charset = {}
$charset[$mtTurtle] = 'utf-8'
+$charset['text/n3'] = 'utf-8'
$charset[$mtText] = 'ascii'
$charset[$mtTriG] = 'utf-8'
$charset[$mtNQuads] = 'utf-8'
http://git-wip-us.apache.org/repos/asf/jena/blob/a479626d/jena-fuseki2/apache-jena-fuseki/bin/s-head
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/bin/s-head b/jena-fuseki2/apache-jena-fuseki/bin/s-head
index dcafe62..9bb7198 100755
--- a/jena-fuseki2/apache-jena-fuseki/bin/s-head
+++ b/jena-fuseki2/apache-jena-fuseki/bin/s-head
@@ -42,7 +42,7 @@ $proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
# What about direct naming?
# Names
-$mtTurtle = 'text/turtle;charset=utf-8'
+$mtTurtle = 'text/turtle'
$mtRDF = 'application/rdf+xml'
$mtText = 'text/plain'
$mtNTriples = 'application/n-triples'
@@ -62,7 +62,7 @@ $mtSparqlQuery = "application/sparql-query" ;
# Global media type table.
$fileMediaTypes = {}
$fileMediaTypes['ttl'] = $mtTurtle
-$fileMediaTypes['n3'] = 'text/n3; charset=utf-8'
+$fileMediaTypes['n3'] = 'text/n3'
$fileMediaTypes['nt'] = $mtText
$fileMediaTypes['rdf'] = $mtRDF
$fileMediaTypes['owl'] = $mtRDF
@@ -75,6 +75,7 @@ $fileMediaTypes['jsonld'] = $mtJSONLD
$charsetUTF8 = 'utf-8'
$charset = {}
$charset[$mtTurtle] = 'utf-8'
+$charset['text/n3'] = 'utf-8'
$charset[$mtText] = 'ascii'
$charset[$mtTriG] = 'utf-8'
$charset[$mtNQuads] = 'utf-8'
http://git-wip-us.apache.org/repos/asf/jena/blob/a479626d/jena-fuseki2/apache-jena-fuseki/bin/s-post
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/bin/s-post b/jena-fuseki2/apache-jena-fuseki/bin/s-post
index dcafe62..9bb7198 100755
--- a/jena-fuseki2/apache-jena-fuseki/bin/s-post
+++ b/jena-fuseki2/apache-jena-fuseki/bin/s-post
@@ -42,7 +42,7 @@ $proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
# What about direct naming?
# Names
-$mtTurtle = 'text/turtle;charset=utf-8'
+$mtTurtle = 'text/turtle'
$mtRDF = 'application/rdf+xml'
$mtText = 'text/plain'
$mtNTriples = 'application/n-triples'
@@ -62,7 +62,7 @@ $mtSparqlQuery = "application/sparql-query" ;
# Global media type table.
$fileMediaTypes = {}
$fileMediaTypes['ttl'] = $mtTurtle
-$fileMediaTypes['n3'] = 'text/n3; charset=utf-8'
+$fileMediaTypes['n3'] = 'text/n3'
$fileMediaTypes['nt'] = $mtText
$fileMediaTypes['rdf'] = $mtRDF
$fileMediaTypes['owl'] = $mtRDF
@@ -75,6 +75,7 @@ $fileMediaTypes['jsonld'] = $mtJSONLD
$charsetUTF8 = 'utf-8'
$charset = {}
$charset[$mtTurtle] = 'utf-8'
+$charset['text/n3'] = 'utf-8'
$charset[$mtText] = 'ascii'
$charset[$mtTriG] = 'utf-8'
$charset[$mtNQuads] = 'utf-8'
http://git-wip-us.apache.org/repos/asf/jena/blob/a479626d/jena-fuseki2/apache-jena-fuseki/bin/s-put
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/bin/s-put b/jena-fuseki2/apache-jena-fuseki/bin/s-put
index dcafe62..9bb7198 100755
--- a/jena-fuseki2/apache-jena-fuseki/bin/s-put
+++ b/jena-fuseki2/apache-jena-fuseki/bin/s-put
@@ -42,7 +42,7 @@ $proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
# What about direct naming?
# Names
-$mtTurtle = 'text/turtle;charset=utf-8'
+$mtTurtle = 'text/turtle'
$mtRDF = 'application/rdf+xml'
$mtText = 'text/plain'
$mtNTriples = 'application/n-triples'
@@ -62,7 +62,7 @@ $mtSparqlQuery = "application/sparql-query" ;
# Global media type table.
$fileMediaTypes = {}
$fileMediaTypes['ttl'] = $mtTurtle
-$fileMediaTypes['n3'] = 'text/n3; charset=utf-8'
+$fileMediaTypes['n3'] = 'text/n3'
$fileMediaTypes['nt'] = $mtText
$fileMediaTypes['rdf'] = $mtRDF
$fileMediaTypes['owl'] = $mtRDF
@@ -75,6 +75,7 @@ $fileMediaTypes['jsonld'] = $mtJSONLD
$charsetUTF8 = 'utf-8'
$charset = {}
$charset[$mtTurtle] = 'utf-8'
+$charset['text/n3'] = 'utf-8'
$charset[$mtText] = 'ascii'
$charset[$mtTriG] = 'utf-8'
$charset[$mtNQuads] = 'utf-8'
http://git-wip-us.apache.org/repos/asf/jena/blob/a479626d/jena-fuseki2/apache-jena-fuseki/bin/s-query
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/bin/s-query b/jena-fuseki2/apache-jena-fuseki/bin/s-query
index dcafe62..9bb7198 100755
--- a/jena-fuseki2/apache-jena-fuseki/bin/s-query
+++ b/jena-fuseki2/apache-jena-fuseki/bin/s-query
@@ -42,7 +42,7 @@ $proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
# What about direct naming?
# Names
-$mtTurtle = 'text/turtle;charset=utf-8'
+$mtTurtle = 'text/turtle'
$mtRDF = 'application/rdf+xml'
$mtText = 'text/plain'
$mtNTriples = 'application/n-triples'
@@ -62,7 +62,7 @@ $mtSparqlQuery = "application/sparql-query" ;
# Global media type table.
$fileMediaTypes = {}
$fileMediaTypes['ttl'] = $mtTurtle
-$fileMediaTypes['n3'] = 'text/n3; charset=utf-8'
+$fileMediaTypes['n3'] = 'text/n3'
$fileMediaTypes['nt'] = $mtText
$fileMediaTypes['rdf'] = $mtRDF
$fileMediaTypes['owl'] = $mtRDF
@@ -75,6 +75,7 @@ $fileMediaTypes['jsonld'] = $mtJSONLD
$charsetUTF8 = 'utf-8'
$charset = {}
$charset[$mtTurtle] = 'utf-8'
+$charset['text/n3'] = 'utf-8'
$charset[$mtText] = 'ascii'
$charset[$mtTriG] = 'utf-8'
$charset[$mtNQuads] = 'utf-8'
http://git-wip-us.apache.org/repos/asf/jena/blob/a479626d/jena-fuseki2/apache-jena-fuseki/bin/s-update
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/bin/s-update b/jena-fuseki2/apache-jena-fuseki/bin/s-update
index dcafe62..9bb7198 100755
--- a/jena-fuseki2/apache-jena-fuseki/bin/s-update
+++ b/jena-fuseki2/apache-jena-fuseki/bin/s-update
@@ -42,7 +42,7 @@ $proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
# What about direct naming?
# Names
-$mtTurtle = 'text/turtle;charset=utf-8'
+$mtTurtle = 'text/turtle'
$mtRDF = 'application/rdf+xml'
$mtText = 'text/plain'
$mtNTriples = 'application/n-triples'
@@ -62,7 +62,7 @@ $mtSparqlQuery = "application/sparql-query" ;
# Global media type table.
$fileMediaTypes = {}
$fileMediaTypes['ttl'] = $mtTurtle
-$fileMediaTypes['n3'] = 'text/n3; charset=utf-8'
+$fileMediaTypes['n3'] = 'text/n3'
$fileMediaTypes['nt'] = $mtText
$fileMediaTypes['rdf'] = $mtRDF
$fileMediaTypes['owl'] = $mtRDF
@@ -75,6 +75,7 @@ $fileMediaTypes['jsonld'] = $mtJSONLD
$charsetUTF8 = 'utf-8'
$charset = {}
$charset[$mtTurtle] = 'utf-8'
+$charset['text/n3'] = 'utf-8'
$charset[$mtText] = 'ascii'
$charset[$mtTriG] = 'utf-8'
$charset[$mtNQuads] = 'utf-8'
http://git-wip-us.apache.org/repos/asf/jena/blob/a479626d/jena-fuseki2/apache-jena-fuseki/bin/s-update-form
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/bin/s-update-form b/jena-fuseki2/apache-jena-fuseki/bin/s-update-form
index dcafe62..9bb7198 100755
--- a/jena-fuseki2/apache-jena-fuseki/bin/s-update-form
+++ b/jena-fuseki2/apache-jena-fuseki/bin/s-update-form
@@ -42,7 +42,7 @@ $proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
# What about direct naming?
# Names
-$mtTurtle = 'text/turtle;charset=utf-8'
+$mtTurtle = 'text/turtle'
$mtRDF = 'application/rdf+xml'
$mtText = 'text/plain'
$mtNTriples = 'application/n-triples'
@@ -62,7 +62,7 @@ $mtSparqlQuery = "application/sparql-query" ;
# Global media type table.
$fileMediaTypes = {}
$fileMediaTypes['ttl'] = $mtTurtle
-$fileMediaTypes['n3'] = 'text/n3; charset=utf-8'
+$fileMediaTypes['n3'] = 'text/n3'
$fileMediaTypes['nt'] = $mtText
$fileMediaTypes['rdf'] = $mtRDF
$fileMediaTypes['owl'] = $mtRDF
@@ -75,6 +75,7 @@ $fileMediaTypes['jsonld'] = $mtJSONLD
$charsetUTF8 = 'utf-8'
$charset = {}
$charset[$mtTurtle] = 'utf-8'
+$charset['text/n3'] = 'utf-8'
$charset[$mtText] = 'ascii'
$charset[$mtTriG] = 'utf-8'
$charset[$mtNQuads] = 'utf-8'
http://git-wip-us.apache.org/repos/asf/jena/blob/a479626d/jena-fuseki2/apache-jena-fuseki/bin/soh
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/bin/soh b/jena-fuseki2/apache-jena-fuseki/bin/soh
index dcafe62..9bb7198 100755
--- a/jena-fuseki2/apache-jena-fuseki/bin/soh
+++ b/jena-fuseki2/apache-jena-fuseki/bin/soh
@@ -42,7 +42,7 @@ $proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
# What about direct naming?
# Names
-$mtTurtle = 'text/turtle;charset=utf-8'
+$mtTurtle = 'text/turtle'
$mtRDF = 'application/rdf+xml'
$mtText = 'text/plain'
$mtNTriples = 'application/n-triples'
@@ -62,7 +62,7 @@ $mtSparqlQuery = "application/sparql-query" ;
# Global media type table.
$fileMediaTypes = {}
$fileMediaTypes['ttl'] = $mtTurtle
-$fileMediaTypes['n3'] = 'text/n3; charset=utf-8'
+$fileMediaTypes['n3'] = 'text/n3'
$fileMediaTypes['nt'] = $mtText
$fileMediaTypes['rdf'] = $mtRDF
$fileMediaTypes['owl'] = $mtRDF
@@ -75,6 +75,7 @@ $fileMediaTypes['jsonld'] = $mtJSONLD
$charsetUTF8 = 'utf-8'
$charset = {}
$charset[$mtTurtle] = 'utf-8'
+$charset['text/n3'] = 'utf-8'
$charset[$mtText] = 'ascii'
$charset[$mtTriG] = 'utf-8'
$charset[$mtNQuads] = 'utf-8'
[3/3] jena git commit: JENA-1383: Merge commit 'refs/pull/275/head'
of github.com:apache/jena
Posted by an...@apache.org.
JENA-1383: Merge commit 'refs/pull/275/head' of github.com:apache/jena
This closes #275.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/116ffb87
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/116ffb87
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/116ffb87
Branch: refs/heads/master
Commit: 116ffb87c5e1731e5ff847cf6773d9927be5a91c
Parents: a479626 9f545d3
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Aug 22 14:22:58 2017 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Aug 22 14:22:58 2017 +0100
----------------------------------------------------------------------
jena-base/src/main/java/org/apache/jena/atlas/io/IO.java | 6 +++---
.../java/org/apache/jena/fuseki/servlets/ActionSPARQL.java | 7 ++++++-
.../java/org/apache/jena/fuseki/servlets/SPARQL_GSP_RW.java | 6 +++++-
3 files changed, 14 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[2/3] jena git commit: Improve handling of bad character encoding.
Posted by an...@apache.org.
Improve handling of bad character encoding.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/9f545d3a
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/9f545d3a
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/9f545d3a
Branch: refs/heads/master
Commit: 9f545d3a17cdc105e3b78726412b163385d9ccce
Parents: 98db314
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Aug 20 15:34:27 2017 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Aug 20 15:34:27 2017 +0100
----------------------------------------------------------------------
jena-base/src/main/java/org/apache/jena/atlas/io/IO.java | 6 +++---
.../java/org/apache/jena/fuseki/servlets/ActionSPARQL.java | 7 ++++++-
.../java/org/apache/jena/fuseki/servlets/SPARQL_GSP_RW.java | 6 +++++-
3 files changed, 14 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/9f545d3a/jena-base/src/main/java/org/apache/jena/atlas/io/IO.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/io/IO.java b/jena-base/src/main/java/org/apache/jena/atlas/io/IO.java
index a1006b0..fea37ac 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/io/IO.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/io/IO.java
@@ -223,17 +223,17 @@ public class IO
try { resource.close(); } catch (Exception ex) { }
}
- /** Throw a RuntimeIOException - this function is guaraentted not to return normally */
+ /** Throw a RuntimeIOException - this function is guaranteed not to return normally */
public static void exception(String message) {
throw new RuntimeIOException(message) ;
}
- /** Throw a RuntimeIOException - this function is guaraentted not to return normally */
+ /** Throw a RuntimeIOException - this function is guaranteed not to return normally */
public static void exception(IOException ex) {
throw new RuntimeIOException(ex) ;
}
- /** Throw a RuntimeIOException - this function is guaraentted not to return normally */
+ /** Throw a RuntimeIOException - this function is guaranteed not to return normally */
public static void exception(String msg, IOException ex) {
throw new RuntimeIOException(msg, ex) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/9f545d3a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionSPARQL.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionSPARQL.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionSPARQL.java
index fda35eb..93cdbfa 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionSPARQL.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionSPARQL.java
@@ -23,6 +23,7 @@ import static org.apache.jena.fuseki.server.CounterName.RequestsBad ;
import static org.apache.jena.fuseki.server.CounterName.RequestsGood ;
import java.io.InputStream ;
+import java.nio.charset.CharacterCodingException;
import org.apache.jena.atlas.RuntimeIOException ;
import org.apache.jena.fuseki.Fuseki ;
@@ -205,7 +206,11 @@ public abstract class ActionSPARQL extends ActionBase
.lang(lang)
.base(base)
.parse(dest);
- }
+ } catch (RuntimeIOException ex) {
+ if ( ex.getCause() instanceof CharacterCodingException )
+ throw new RiotException("Character Coding Error: "+ex.getMessage());
+ throw ex;
+ }
catch (RiotException ex) { ServletOps.errorBadRequest("Parse error: "+ex.getMessage()) ; }
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/9f545d3a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_GSP_RW.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_GSP_RW.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_GSP_RW.java
index f410efb..18e7148 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_GSP_RW.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_GSP_RW.java
@@ -128,13 +128,17 @@ public class SPARQL_GSP_RW extends SPARQL_GSP_R
upload.setExistedBefore(existedBefore) ;
action.commit() ;
return upload ;
+ } catch (ActionErrorException ex) {
+ // Any ServletOps.error from calls in the try{} block.
+ action.abort() ;
+ throw ex;
} catch (RiotException ex) {
// Parse error
action.abort() ;
ServletOps.errorBadRequest(ex.getMessage()) ;
return null ;
} catch (Exception ex) {
- // Something else went wrong. Backout.
+ // Something unexpected.
action.abort() ;
ServletOps.errorOccurred(ex.getMessage()) ;
return null ;