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 2016/08/05 16:34:01 UTC

[3/6] jena git commit: Gate quads requests by whether quads operations are enabled.

Gate quads requests by whether quads operations are enabled.

It used to be by whether GSP oprations were but the builder now contains
that relationship.

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

Branch: refs/heads/master
Commit: f643025b58c2f30415a650babe84a74275b30131
Parents: 9f1ea9c
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Aug 5 17:30:48 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Aug 5 17:30:48 2016 +0100

----------------------------------------------------------------------
 .../apache/jena/fuseki/servlets/SPARQL_UberServlet.java | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/f643025b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java
index 7388b46..d04a3a3 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java
@@ -219,7 +219,7 @@ public abstract class SPARQL_UberServlet extends ActionSPARQL
                 // SPARQL Update
                 if ( !allowUpdate(action) )
                     ServletOps.errorMethodNotAllowed("SPARQL update : "+method) ;
-                // This wil dela with using GET.
+                // This will deal with using GET.
                 executeRequest(action, updateServlet) ;
                 return ;
             }
@@ -241,16 +241,14 @@ public abstract class SPARQL_UberServlet extends ActionSPARQL
 
             // Check enabled.
             if ( isGET || isHEAD ) {
-                if ( allowREST_R(action) || allowQuadsR(action) )
+                if ( allowQuadsR(action) )
                     restQuads_R.executeLifecycle(action) ;
                 else
-                    ServletOps.errorMethodNotAllowed("Read-only dataset : "+method) ;
+                    ServletOps.errorMethodNotAllowed(method) ;
                 return ;
             }
-            // If the read-only server has the same name as the writable server,
-            // and the default for a read-only server is "/data", like a writable dataset,
-            // this test is insufficient.
-            if ( allowREST_W(action) )
+            
+            if ( allowQuadsW(action) )
                 restQuads_RW.executeLifecycle(action) ;
             else
                 ServletOps.errorMethodNotAllowed("Read-only dataset : "+method) ;