[Openutils-svn] SF.net SVN: openutils:[1563] trunk/openutils-mgnlmedia/src/main/java/net/ sourceforge/openutils/mgnlmedia/media

[<fg...@us...>]

Revision: 1563
          http://openutils.svn.sourceforge.net/openutils/?rev=1563&view=rev
Author:   fgiust
Date:     2009-12-30 19:48:09 +0000 (Wed, 30 Dec 2009)

Log Message:
-----------
properly cleanup temporary files

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java	2009-12-30 19:22:33 UTC (rev 1562)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java	2009-12-30 19:48:09 UTC (rev 1563)
@@ -48,6 +48,7 @@
 import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
 import net.sourceforge.openutils.mgnlmedia.media.utils.MediaLoadUtils;
 
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
@@ -126,9 +127,10 @@
     public String saveZip()
     {
         InputStream zipStream = null;
+        File temp = null;
         try
         {
-            File temp = File.createTempFile("zipmedia", ".zip");
+            temp = File.createTempFile("zipmedia", ".zip");
             FileOutputStream fos = new FileOutputStream(temp);
 
             zipStream = zipFile.getStream();
@@ -184,6 +186,8 @@
             IOUtils.closeQuietly(zipStream);
         }
 
+        FileUtils.deleteQuietly(temp);
+
         this.openPath = parentPath;
 
         return this.show();

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java	2009-12-30 19:22:33 UTC (rev 1562)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/MediaLoadUtils.java	2009-12-30 19:48:09 UTC (rev 1563)
@@ -45,6 +45,7 @@
 import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
 import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
 
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
@@ -131,7 +132,7 @@
 
             mgr.save();
 
-            File f = File.createTempFile("entry", extension);
+            File f = File.createTempFile("entry", "." + extension);
             FileOutputStream fTemp = new FileOutputStream(f);
 
             IOUtils.copy(inputStream, fTemp);
@@ -141,6 +142,9 @@
             mtc.getHandler().saveFromZipFile(media, f, cleanFilename, extension);
 
             mgr.save();
+
+            FileUtils.deleteQuietly(f);
+
             return media;
         }
         return null;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.