svn commit: r1440527 - in /jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki: mgt/ActionBackup.java servlets/SPARQL_ServletBase.java servlets/ServletBase.java

[andy]

Author: andy
Date: Wed Jan 30 17:11:15 2013
New Revision: 1440527

URL: http://svn.apache.org/viewvc?rev=1440527&view=rev
Log:
Rename getRequestId as allocRequestId because it has a sideeffect.
Add request to the call in case we want to add info from the request 
(abstraction).

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

Modified: 
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java
URL: 
http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java?rev=1440527&r1=1440526&r2=1440527&view=diff
==============================================================================
--- 
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java
 (original)
+++ 
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java
 Wed Jan 30 17:11:15 2013
@@ -84,7 +84,7 @@ public class ActionBackup extends Servle
         }
 
         DatasetRef ref = DatasetRegistry.get().get(dataset) ;
-        long id = this.getRequestId(response);
+        long id = allocRequestId(request, response);
         HttpAction action = new HttpAction(id, ref, request, response, false) ;
         scheduleBackup(action, dataset) ;
     }

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=1440527&r1=1440526&r2=1440527&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 Jan 30 17:11:15 2013
@@ -54,7 +54,7 @@ public abstract class SPARQL_ServletBase
     protected void doCommon(HttpServletRequest request, HttpServletResponse 
response)
     //throws ServletException, IOException
     {
-        long id = this.getRequestId(response);
+        long id = allocRequestId(request, response);
         printRequest(id, request) ;
         
         HttpServletResponseTracker responseTracked = new 
HttpServletResponseTracker(response) ;

Modified: 
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java
URL: 
http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java?rev=1440527&r1=1440526&r2=1440527&view=diff
==============================================================================
--- 
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java
 (original)
+++ 
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java
 Wed Jan 30 17:11:15 2013
@@ -45,12 +45,13 @@ public abstract class ServletBase extend
     
     /**
      * Helper method which gets a unique request ID and appends it as a header 
to the response
-     * @param response Response
+     * @param request  HTTP Request
+     * @param response HTTP Response
      * @return Request ID
      */
-    protected long getRequestId(HttpServletResponse response) {
-        long id = ServletBase.requestIdAlloc.incrementAndGet();
-        this.addRequestId(response, id);
+    protected long allocRequestId(HttpServletRequest request, 
HttpServletResponse response) {
+        long id = requestIdAlloc.incrementAndGet();
+        addRequestId(response, id);
         return id;
     }