Author: tchemit Date: 2012-10-12 00:31:21 +0200 (Fri, 12 Oct 2012) New Revision: 726 Url: http://forge.codelutin.com/repositories/revision/echobase/726 Log: make Loader works with gz files Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java 2012-10-11 22:30:14 UTC (rev 725) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java 2012-10-11 22:31:21 UTC (rev 726) @@ -38,7 +38,6 @@ import fr.ifremer.echobase.services.EchoBaseServiceSupport; import fr.ifremer.echobase.services.exportdb.ExportService; import fr.ifremer.echobase.services.importdb.EchoBaseImportModelFactory; -import fr.ifremer.echobase.services.importdb.ImportService; import fr.ifremer.echobase.tools.FileType; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; @@ -71,6 +70,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.zip.GZIPInputStream; /** * Support for Csv file generator. @@ -333,8 +333,8 @@ public void copyStreamToFile(File file, FileType fileType) throws IOException { String path = "/csv/" + fileType.name().toLowerCase() + "/" + - file.getName(); - InputStream stream = getClass().getResourceAsStream(path); + file.getName() + ".gz"; + InputStream stream = new GZIPInputStream(getClass().getResourceAsStream(path)); try { Preconditions.checkNotNull(stream, "could not find class-path resource " + path); @@ -345,9 +345,7 @@ outStream.close(); } } finally { - if (stream != null) { - stream.close(); - } + stream.close(); } }