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 2013/08/29 20:08:59 UTC
svn commit: r1518741 -
/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Update.java
Author: andy
Date: Thu Aug 29 18:08:59 2013
New Revision: 1518741
URL: http://svn.apache.org/r1518741
Log:
Don't increment bad update execution counter when it's a parse error, which is a bad request.
Modified:
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Update.java
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Update.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Update.java?rev=1518741&r1=1518740&r2=1518741&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Update.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Update.java Thu Aug 29 18:08:59 2013
@@ -228,12 +228,12 @@ public class SPARQL_Update extends SPARQ
req = UpdateFactory.read(usingList, input, UpdateParseBase, Syntax.syntaxARQ);
}
catch (UpdateException ex) { errorBadRequest(ex.getMessage()) ; return ; }
- catch (QueryParseException ex) { errorBadRequest(messageForQPE(ex)) ; return ; }
+ catch (QueryParseException ex) { errorBadRequest(messageForQPE(ex)) ; return ; }
}
action.beginWrite() ;
try {
- if (action.isTransactional())
+ if (req == null )
UpdateAction.parseExecute(usingList, action.getActiveDSG(), input, UpdateParseBase, Syntax.syntaxARQ);
else
UpdateAction.execute(req, action.getActiveDSG()) ;
@@ -241,10 +241,10 @@ public class SPARQL_Update extends SPARQ
} catch (UpdateException ex) {
action.abort() ;
incCounter(action.srvRef, UpdateExecErrors) ;
- errorBadRequest(ex.getMessage()) ;
+ errorOccurred(ex.getMessage()) ;
} catch (QueryParseException ex) {
action.abort() ;
- incCounter(action.srvRef, UpdateExecErrors) ;
+ // Counter inc'ed further out.
errorBadRequest(messageForQPE(ex)) ;
} catch (Throwable ex) {
if ( ! ( ex instanceof ActionErrorException ) )