svn commit: r1368495 - /jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_ServletBase.java

[an...@apache.org]

Author: andy
Date: Thu Aug  2 14:49:15 2012
New Revision: 1368495

URL: http://svn.apache.org/viewvc?rev=1368495&view=rev
Log:
pick the right timeout setting

Modified:
    jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_ServletBase.java

Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_ServletBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_ServletBase.java?rev=1368495&r1=1368494&r2=1368495&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_ServletBase.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_ServletBase.java Thu Aug  2 14:49:15 2012
@@ -37,6 +37,7 @@ import com.hp.hpl.jena.query.ARQ ;
 import com.hp.hpl.jena.query.QueryCancelledException ;
 import com.hp.hpl.jena.sparql.core.DatasetGraph ;
 import com.hp.hpl.jena.sparql.core.DatasetGraphFactory ;
+import com.hp.hpl.jena.sparql.util.Context ;
 import com.hp.hpl.jena.tdb.migrate.DatasetGraphReadOnly ;
 
 public abstract class SPARQL_ServletBase extends ServletBase
@@ -66,6 +67,9 @@ public abstract class SPARQL_ServletBase
         String uri = request.getRequestURI() ;
         initResponse(request, response) ;
         
+        DatasetRef desc = null ;
+        Context cxt = ARQ.getContext() ;
+        
         try {
             if ( request.getQueryString() == null && queryStringHandling == PlainRequestFlag.DIFFERENT )
             {
@@ -75,7 +79,7 @@ public abstract class SPARQL_ServletBase
             }
 
             uri = mapRequestToDataset(uri) ;
-            DatasetRef desc = null ;
+
             if ( uri != null )
             {
                 desc = DatasetRegistry.get().get(uri) ;
@@ -84,6 +88,7 @@ public abstract class SPARQL_ServletBase
                     errorNotFound("No dataset for URI: "+uri) ;
                     return ;
                 }
+                cxt = desc.dataset.getContext() ;
             }
             else {
                 desc = new DatasetRef();
@@ -93,7 +98,7 @@ public abstract class SPARQL_ServletBase
             //serverlog.info(String.format("[%d] 200 Success", id)) ;
         } catch (QueryCancelledException ex)
         {
-        	String message = String.format("The query timed out (restricted to %s ms).", ARQ.getContext().get(ARQ.queryTimeout));
+        	String message = String.format("The query timed out (restricted to %s ms)", cxt.get(ARQ.queryTimeout));
         	responseSendError(response, HttpSC.REQUEST_TIMEOUT_408, message);
             // Log message done by printResponse in a moment.
         } catch (ActionErrorException ex)