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 2013/09/18 21:26:48 UTC

svn commit: r1524537 - /jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseOps.java

Author: andy
Date: Wed Sep 18 19:26:48 2013
New Revision: 1524537

URL: http://svn.apache.org/r1524537
Log:
JENA-534

Modified:
    jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseOps.java

Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseOps.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseOps.java?rev=1524537&r1=1524536&r2=1524537&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseOps.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseOps.java Wed Sep 18 19:26:48 2013
@@ -58,27 +58,16 @@ public class ResponseOps
         String x = fetchParam(request, HttpNames.paramOutput1) ;
         if ( x == null )
             x = fetchParam(request, HttpNames.paramOutput2) ;
-        String z = expandShortName(x, map) ;
-        return z.toLowerCase(Locale.ROOT) ;
+        return expandShortName(x, map) ;
     }
 
-//    public static String paramAcceptField(HttpServletRequest request, Map<String,String> map)
-//    {
-//        String acceptField = WebLib.getAccept(request) ;
-//        String acceptParam = fetchParam(request, HttpNames.paramAccept) ;
-//        
-//        if ( acceptParam != null )
-//            acceptField = acceptParam ;
-//        if ( acceptField == null )
-//            return null ;
-//        return expandShortName(acceptField, map) ; 
-//    }
-
     public static String expandShortName(String str, Map<String,String> map)
     {
         if ( str == null )
             return null ;
-        String str2 = map.get(str) ;
+        // Force keys to lower case. See put() above.
+        String key = str.toLowerCase(Locale.ROOT) ;
+        String str2 = map.get(key) ;
         if ( str2 == null )
             return str ;
         return str2 ;