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

[andy]

Author: andy
Date: Wed Apr 17 20:06:41 2013
New Revision: 1469051

URL: http://svn.apache.org/r1469051
Log:
JENA-439
Catch QueryCancelledException and send 503, not 408.

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=1469051&r1=1469050&r2=1469051&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
 Wed Apr 17 20:06:41 2013
@@ -65,14 +65,12 @@ public abstract class SPARQL_ServletBase
         try {
             validate(request) ;
             doCommonWorker(id, request, response) ;
-        } catch (QueryCancelledException ex)
-        {
+        } 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));
-            responseSendError(response, HttpSC.REQUEST_TIMEOUT_408, message);
-            // Log message done by printResponse in a moment.
-        } catch (ActionErrorException ex)
-        {
+            // Possibility :: response.setHeader("Retry-after", "600") ;    // 
5 minutes
+            responseSendError(response, HttpSC.SERVICE_UNAVAILABLE_503, 
message);
+        } catch (ActionErrorException ex) {
             if ( ex.exception != null )
                 ex.exception.printStackTrace(System.err) ;
             // Log message done by printResponse in a moment.
@@ -80,9 +78,8 @@ public abstract class SPARQL_ServletBase
                 responseSendError(response, ex.rc, ex.message) ;
             else
                 responseSendError(response, ex.rc) ;
-        }
-        catch (Throwable ex)
-        {   // This should not happen.
+        } catch (Throwable ex) {
+            // This should not happen.
             //ex.printStackTrace(System.err) ;
             log.warn(format("[%d] RC = %d : %s", id, 
HttpSC.INTERNAL_SERVER_ERROR_500, ex.getMessage()), ex) ;
             responseSendError(response, HttpSC.INTERNAL_SERVER_ERROR_500, 
ex.getMessage()) ;