first cut of merge of STABLE-pre1_0 into HEAD. I won't even guarantee that it

[mir.git] / source / mircoders / module / ModuleUploadedMedia.java

diff --git a/source/mircoders/module/ModuleUploadedMedia.java b/source/mircoders/module/ModuleUploadedMedia.java
index 76a1cec..e3446e8 100755 (executable)
--- a/source/mircoders/module/ModuleUploadedMedia.java
+++ b/source/mircoders/module/ModuleUploadedMedia.java
@@ -32,11 +32,16 @@ public class ModuleUploadedMedia extends AbstractModule
     public ModuleUploadedMedia(StorageObject theStorage) {
            this.theStorage = theStorage;
            if (theLog == null)
-             theLog = Logfile.getInstance(this.getClass().getName());
+             theLog = Logfile.getInstance(MirConfig.getProp("Home") + MirConfig.getProp("Module.Themen.Logfile"));
     }
 
-    public SimpleList getUploadedMediaAsSimpleList() {
-           return ((DatabaseUploadedMedia)theStorage).getPopupData();
+    public SimpleList getUploadedMediaAsSimpleList()
+      throws ModuleException {
+      try {
+             return ((DatabaseUploadedMedia)theStorage).getPopupData();
+      } catch (StorageObjectException e) {
+        throw new ModuleException(e.toString());
+      }
     }
 
 }