fixing scaling images -> nullpointer, patch by yossarian

[mir.git] / source / mircoders / storage / DatabaseUploadedMedia.java

diff --git a/source/mircoders/storage/DatabaseUploadedMedia.java b/source/mircoders/storage/DatabaseUploadedMedia.java
index 7f9bc71..97294fb 100755 (executable)
--- a/source/mircoders/storage/DatabaseUploadedMedia.java
+++ b/source/mircoders/storage/DatabaseUploadedMedia.java
@@ -37,11 +37,12 @@ import mir.entity.EntityBrowser;
 import mir.log.LoggerWrapper;
 import mir.storage.Database;
 import mir.storage.DatabaseFailure;
+import mircoders.entity.EntityUploadedMedia;
 
 public class DatabaseUploadedMedia extends Database  {
-  private static DatabaseUploadedMedia  instance;
+  private static DatabaseUploadedMedia instance;
 
-  public synchronized static DatabaseUploadedMedia getInstance() {
+  public static synchronized DatabaseUploadedMedia getInstance() {
     if (instance == null ) {
       instance = new DatabaseUploadedMedia();
     }
@@ -50,12 +51,10 @@ public class DatabaseUploadedMedia extends Database  {
   }
 
   private DatabaseUploadedMedia() {
-    super();
-
     logger = new LoggerWrapper("Database.UploadedMedia");
 
     mainTable="uploaded_media";
-    entityClass = mircoders.entity.EntityUploadedMedia.class;
+    entityClass = EntityUploadedMedia.class;
   }
 
 
@@ -63,12 +62,14 @@ public class DatabaseUploadedMedia extends Database  {
    * returns the media_type that belongs to the media item (via entityrelation)
    * where db-flag is_published is true
    */
-  public Entity getMediaType(Entity ent) throws DatabaseFailure {
+  public Entity getMediaType(Entity aMedia) throws DatabaseFailure {
     Entity type=null;
     try {
-      Iterator i = new EntityBrowser(DatabaseMediaType.getInstance(), ent.getFieldValue("to_media_type") + " = id" , "id", 1);
-      if (i.hasNext())
+      Iterator i = new EntityBrowser(DatabaseMediaType.getInstance(), aMedia.getFieldValue("to_media_type") + " = id" , "id", 1);
+
+      if (i.hasNext()) {
         type = (Entity) i.next();
+      }
     }
     catch (Throwable t) {
       logger.error("DatabaseUploadedMedia :: failed to get media_type: " + t.getMessage());