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 2012/08/22 19:04:36 UTC

svn commit: r1376143 - in /jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets: SPARQL_Query.java SPARQL_QueryDataset.java SPARQL_ServletBase.java

Author: andy
Date: Wed Aug 22 17:04:35 2012
New Revision: 1376143

URL: http://svn.apache.org/viewvc?rev=1376143&view=rev
Log:
Request validation was happening 3 times per request.

Modified:
    jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
    jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryDataset.java
    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_Query.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java?rev=1376143&r1=1376142&r2=1376143&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java Wed Aug 22 17:04:35 2012
@@ -98,7 +98,6 @@ public abstract class SPARQL_Query exten
     @Override
     protected final void perform(long id, DatasetRef desc, HttpServletRequest request, HttpServletResponse response)
     {
-        validate(request) ;
         HttpActionQuery action = new HttpActionQuery(id, desc, request, response, verbose_debug) ;
         // GET
         if ( request.getMethod().equals(HttpNames.METHOD_GET) )

Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryDataset.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryDataset.java?rev=1376143&r1=1376142&r2=1376143&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryDataset.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryDataset.java Wed Aug 22 17:04:35 2012
@@ -63,7 +63,7 @@ public class SPARQL_QueryDataset extends
         // Protocol.
         DatasetDescription dsDesc = getDatasetDescription(action) ;
         if (dsDesc != null )
-            warning("SPARQL Query: Ignoring dataset description in the protocol request") ;  
+            errorBadRequest("SPARQL Query: Dataset description in the protocol request") ;  
         
         return DatasetFactory.create(action.getActiveDSG()) ;
     }

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=1376143&r1=1376142&r2=1376143&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 Aug 22 17:04:35 2012
@@ -102,8 +102,6 @@ public abstract class SPARQL_ServletBase
         DatasetRef desc = null ;
         String uri = request.getRequestURI() ;
 
-        validate(request) ;
-        
         uri = mapRequestToDataset(uri) ;
 
         if ( uri != null )