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 2017/06/15 11:41:12 UTC

jena git commit: Check for bad request.

Repository: jena
Updated Branches:
  refs/heads/master 739a7187a -> 61526b892


Check for bad request.

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

Branch: refs/heads/master
Commit: 61526b8923f270f438a90181add2c1289e772800
Parents: 739a718
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Jun 15 12:40:58 2017 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Jun 15 12:40:58 2017 +0100

----------------------------------------------------------------------
 .../java/org/apache/jena/fuseki/mgt/ActionDatasets.java   | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/61526b89/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java
index 4be5cef..8f8bfae 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java
@@ -114,6 +114,14 @@ public class ActionDatasets extends ActionContainerItem {
         
         ContentType ct = FusekiLib.getContentType(action) ;
         
+        boolean hasParams = action.request.getParameterNames().hasMoreElements();
+        
+        if ( ct == null && ! hasParams ) {
+            ServletOps.errorBadRequest("Bad request - Content-Type or both parameters dbName and dbType required");
+            // Or do "GET over POST"
+            //return execGetContainer(action);
+        }
+        
         boolean committed = false ;
         // Also acts as a concurrency lock
         system.begin(ReadWrite.WRITE) ;
@@ -125,7 +133,7 @@ public class ActionDatasets extends ActionContainerItem {
             Model model = ModelFactory.createDefaultModel() ;
             StreamRDF dest = StreamRDFLib.graph(model.getGraph()) ;
     
-            if ( WebContent.isHtmlForm(ct) )
+            if ( hasParams || WebContent.isHtmlForm(ct) )
                 assemblerFromForm(action, dest) ;
             else if ( WebContent.isMultiPartForm(ct) )
                 assemblerFromUpload(action, dest) ;