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 2015/04/19 18:50:39 UTC

jena git commit: JENA-917: Fix timeout message

Repository: jena
Updated Branches:
  refs/heads/master 620d9550d -> 281e655a0


JENA-917: Fix timeout message


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/281e655a
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/281e655a
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/281e655a

Branch: refs/heads/master
Commit: 281e655a0cc696b76006a7bda0582662eefd98de
Parents: 620d955
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Apr 19 17:50:29 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Apr 19 17:50:29 2015 +0100

----------------------------------------------------------------------
 .../java/org/apache/jena/fuseki/servlets/ActionBase.java    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/281e655a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionBase.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionBase.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionBase.java
index 3e45c78..9cc49d5 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionBase.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionBase.java
@@ -80,8 +80,13 @@ public abstract class ActionBase extends ServletBase
             try {
                 execCommonWorker(action) ;
             } catch (QueryCancelledException ex) {
-                // Also need the per query info ...
-                String message = String.format("The query timed out (restricted to %s ms)", cxt.get(ARQ.queryTimeout));
+                // To put in the action timeout, need (1) global, (2) dataset and (3) protocol settings.
+                // See
+                //    global -- cxt.get(ARQ.queryTimeout) 
+                //    dataset -- dataset.getContect(ARQ.queryTimeout)
+                //    protocol -- SPARQL_Query.setAnyTimeouts
+                
+                String message = String.format("Query timed out");
                 // Possibility :: response.setHeader("Retry-after", "600") ;    // 5 minutes
                 ServletOps.responseSendError(response, HttpSC.SERVICE_UNAVAILABLE_503, message);
             } catch (ActionErrorException ex) {