*** empty log message ***

[mir.git] / source / mircoders / media / MediaUploadProcessor.java

diff --git a/source/mircoders/media/MediaUploadProcessor.java b/source/mircoders/media/MediaUploadProcessor.java
index b014f58..f17b16a 100755 (executable)
--- a/source/mircoders/media/MediaUploadProcessor.java
+++ b/source/mircoders/media/MediaUploadProcessor.java
@@ -29,20 +29,22 @@
  */
 package mircoders.media;
 
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.Map;
-
 import mir.entity.Entity;
 import mir.log.LoggerWrapper;
 import mir.media.MediaFailure;
 import mir.media.MediaHandler;
+import mir.media.MediaExc;
 import mir.misc.StringUtil;
 import mir.session.UploadedFile;
 import mir.storage.Database;
+import mir.storage.DatabaseExc;
 import mir.util.FileRoutines;
 import mircoders.module.ModuleMediaType;
 
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.Map;
+
 public class MediaUploadProcessor {
   private static LoggerWrapper logger = new LoggerWrapper("Media.UploadProcessor");
   private static ModuleMediaType mediaTypeModule = new ModuleMediaType();
@@ -51,7 +53,8 @@ public class MediaUploadProcessor {
    * Processes an uploaded media file.
    * Will create the media entity and so on. 
    */
-  public static Entity processMediaUpload(UploadedFile aFile, Map aValues) throws UnsupportedMediaTypeExc, MediaFailure {
+  public static Entity processMediaUpload(UploadedFile aFile, Map aValues) 
+      throws UnsupportedMediaTypeExc, MediaExc, DatabaseExc {
     MediaHandler mediaHandler;
     Entity mediaType = null;
     Database mediaStorage;
@@ -89,11 +92,11 @@ public class MediaUploadProcessor {
 
     values.put("to_media_type", mediaType.getId());
 
+    mediaEntity = mediaStorage.createNewEntity();
+    mediaEntity.setFieldValues(values);
+    mediaEntity.insert();
+    mediaHandler.store(aFile, mediaEntity, mediaType);
     try {
-      mediaEntity = mediaStorage.createNewEntity();
-      mediaEntity.setFieldValues(values);
-      mediaEntity.insert();
-      mediaHandler.store(aFile, mediaEntity, mediaType);
     }
     catch (Throwable e) {
       throw new MediaFailure(e);