You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by an...@apache.org on 2013/09/30 02:11:32 UTC

git commit: MARMOTTA-325 : Preference the default mime types before other mime types

Updated Branches:
  refs/heads/develop 48db2490f -> 8642282d8


MARMOTTA-325 : Preference the default mime types before other mime types

OpenRDF add all of the common mime types for formats to the format
definition, including stating explicitly what the default should be.
This patch adds the default mime types to the LinkedHashSet first, so
they are iterated over before the other types.

Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/8642282d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/8642282d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/8642282d

Branch: refs/heads/develop
Commit: 8642282d8642f8d8f18903f27ab850009a8dadc7
Parents: 48db249
Author: Peter Ansell <p_...@yahoo.com>
Authored: Mon Sep 30 10:10:55 2013 +1000
Committer: Peter Ansell <p_...@yahoo.com>
Committed: Mon Sep 30 10:10:55 2013 +1000

----------------------------------------------------------------------
 .../marmotta/platform/sparql/webservices/SparqlWebService.java    | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/8642282d/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/webservices/SparqlWebService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/webservices/SparqlWebService.java b/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/webservices/SparqlWebService.java
index c1db1be..18ce4a2 100644
--- a/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/webservices/SparqlWebService.java
+++ b/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/webservices/SparqlWebService.java
@@ -536,6 +536,9 @@ public class SparqlWebService {
     private Set<String> getTypes(Collection<? extends QueryResultFormat> types) {
         Set<String> results = new LinkedHashSet<String>();
         for(QueryResultFormat type : types) {
+            results.add(type.getDefaultMIMEType());
+        }
+        for(QueryResultFormat type : types) {
             results.addAll(type.getMIMETypes());
         }
         // HACK: Remove application/xml so that application/sparql-results+xml