JENA-873 : Fix for absence of Content-Type in a POST.

mahedi-kaysar · Jan 29, 2015 · 2b79b0e · 2b79b0e
1 parent aafd5d6
commit 2b79b0e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 13 deletions.
diff --git a/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java b/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
@@ -78,28 +78,30 @@ protected void doOptions(HttpServletRequest request, HttpServletResponse respons
     protected final void perform(HttpAction action)
     {
         // GET
-        if ( action.request.getMethod().equals(HttpNames.METHOD_GET) )
-        {
+        if ( action.request.getMethod().equals(HttpNames.METHOD_GET) ) {
             executeWithParameter(action) ;
             return ;
         }
 
         ContentType ct = FusekiLib.getContentType(action) ;
+        if ( ct == null ) {
+            // Validation check it's POST with ?query=
+            executeWithParameter(action) ;
+            return ;
+        }
+
         String incoming = ct.getContentType() ;
-
         // POST application/sparql-query
-        if (WebContent.contentTypeSPARQLQuery.equals(incoming))
-        {
+        if (WebContent.contentTypeSPARQLQuery.equals(incoming)) {
             executeBody(action) ;
             return ;
         }
         // POST application/x-www-form-url
-        if (WebContent.contentTypeHTMLForm.equals(incoming))
-        {
+        if (WebContent.contentTypeHTMLForm.equals(incoming)) {
             executeWithParameter(action) ;
             return ;
         }
-
+        
         error(HttpSC.UNSUPPORTED_MEDIA_TYPE_415, "Bad content type: "+incoming) ;
     }
 

diff --git a/...-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java b/...-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
@@ -101,10 +101,11 @@ protected final void perform(HttpAction action) {
         }
 
         ContentType ct = FusekiLib.getContentType(action) ;
-        String incoming = ct.getContentType() ;
 
         // POST application/x-www-form-url
-        if ( isHtmlForm(ct) ) {
+        // POST ?query= and no Content-Type
+        if ( ct == null || isHtmlForm(ct) ) {
+            // validation checked that if no Content-type, then its a POST with ?query=
             executeWithParameter(action) ;
             return ;
         }
@@ -115,7 +116,7 @@ protected final void perform(HttpAction action) {
             return ;
         }
 
-        ServletOps.error(HttpSC.UNSUPPORTED_MEDIA_TYPE_415, "Bad content type: " + incoming) ;
+        ServletOps.error(HttpSC.UNSUPPORTED_MEDIA_TYPE_415, "Bad content type: " + ct.getContentType()) ;
     }
 
     // All the params we support
@@ -170,8 +171,10 @@ protected void validateParams(HttpAction action, Collection<String> params) {
 
             if ( matchContentType(ctSPARQLQuery, ct) ) {
                 mustHaveQueryParam = false ;
-            } else if ( matchContentType(ctHTMLForm, ct))
-            {} 
+                // Drop through.
+            } else if ( matchContentType(ctHTMLForm, ct)) {
+                // Nothing specific to do
+            } 
             else
                 ServletOps.error(HttpSC.UNSUPPORTED_MEDIA_TYPE_415, "Unsupported: " + incoming) ;
         }