svn commit: r1547798 - /jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java

[rv...@apache.org]

Author: rvesse
Date: Wed Dec  4 13:58:35 2013
New Revision: 1547798

URL: http://svn.apache.org/r1547798
Log:
Fix for JENA-600, if the uploaded file has a .gz extension be sure to wrap the incoming input stream in a GZipInputStream

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

Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java?rev=1547798&r1=1547797&r2=1547798&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java Wed Dec  4 13:58:35 2013
@@ -23,6 +23,7 @@ import static java.lang.String.format ;
 import java.io.IOException ;
 import java.io.InputStream ;
 import java.io.PrintWriter;
+import java.util.zip.GZIPInputStream;
 
 import javax.servlet.ServletException ;
 import javax.servlet.http.HttpServletRequest ;
@@ -222,8 +223,15 @@ public class SPARQL_Upload extends SPARQ
                     ct = ContentType.create(contentTypeHeader) ;
 
                     lang = WebContent.contentTypeToLang(ct.getContentType()) ;
-                    if ( lang == null )
+
+                    if ( lang == null ) {
                         lang = RDFLanguages.filenameToLang(name) ;
+                        
+                        //JENA-600 filenameToLang() strips off certain extensions such as .gz and 
+                        //we need to ensure that if there was a .gz extension present we wrap the stream accordingly
+                        if (name.endsWith(".gz"))
+                            stream = new GZIPInputStream(stream);
+                    }
                     if ( lang == null )
                         // Desperate.
                         lang = RDFLanguages.RDFXML ;