Author: tchemit Date: 2011-12-11 19:15:03 +0100 (Sun, 11 Dec 2011) New Revision: 161 Url: http://forge.codelutin.com/repositories/revision/echobase/161 Log: fix some io codes Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java 2011-12-11 18:14:16 UTC (rev 160) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java 2011-12-11 18:15:03 UTC (rev 161) @@ -24,6 +24,7 @@ package fr.ifremer.echobase.services; import com.google.common.base.Supplier; +import fr.ifremer.echobase.EchoBaseIOUtil; import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.EchoBaseTopiaRootContextSupplierFactory; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; @@ -40,7 +41,11 @@ import org.nuiton.topia.replication.model.ReplicationModel; import org.nuiton.util.FileUtil; -import java.io.*; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.net.URISyntaxException; import java.util.List; @@ -83,7 +88,7 @@ File warLocation = getConfiguration().getWarLocation(); File tempDirectory = new File(FileUtils.getTempDirectory(), - "echobase-embedded_" + System.nanoTime()); + "echobase-embedded_" + System.nanoTime()); tempDirectory.deleteOnExit(); File zipDirectory = new File(tempDirectory, fileName); @@ -92,7 +97,7 @@ if (log.isInfoEnabled()) { log.info("Creates zip file [" + zipFile + "] from directory " + - zipDirectory); + zipDirectory); } try { // create / @@ -116,7 +121,7 @@ zipDirectory, eee); } - compressZipFile(zipFile, zipDirectory); + EchoBaseIOUtil.compressZipFile(zipFile, zipDirectory); return zipFile; } @@ -127,14 +132,16 @@ InputStream inputStream = getClass().getResourceAsStream(startFile.getFilePath()); - - File startFileDest = new File(zipDirectory, startFile.getFileName()); - OutputStream outputStream = new FileOutputStream(startFileDest); try { - IOUtils.copy(inputStream, outputStream); + File startFileDest = new File(zipDirectory, startFile.getFileName()); + OutputStream outputStream = new FileOutputStream(startFileDest); + try { + IOUtils.copy(inputStream, outputStream); + } finally { + outputStream.close(); + } } finally { - IOUtils.closeQuietly(inputStream); - IOUtils.closeQuietly(outputStream); + inputStream.close(); } } } @@ -147,13 +154,15 @@ } InputStream configInputStream = getClass().getResourceAsStream(EMBEDDED_PATH + "echobase-embedded.properties"); - - OutputStream configOutputStream = new FileOutputStream(configurationfile); try { - IOUtils.copy(configInputStream, configOutputStream); + OutputStream configOutputStream = new FileOutputStream(configurationfile); + try { + IOUtils.copy(configInputStream, configOutputStream); + } finally { + configOutputStream.close(); + } } finally { - IOUtils.closeQuietly(configInputStream); - configOutputStream.close(); + configInputStream.close(); } } @@ -180,7 +189,7 @@ // create new service context (with new transaction) EchoBaseServiceContext newServiceContext = EchoBaseServiceContextImpl.newContext(serviceContext, - topiaContext); + topiaContext); // get user service from h2 db UserService userService =