fixing scaling images -> nullpointer, patch by yossarian

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

diff --git a/source/mircoders/storage/DatabaseContentToMedia.java b/source/mircoders/storage/DatabaseContentToMedia.java
index bcdc80e..11a2b35 100755 (executable)
--- a/source/mircoders/storage/DatabaseContentToMedia.java
+++ b/source/mircoders/storage/DatabaseContentToMedia.java
@@ -37,14 +37,14 @@ import java.util.ArrayList;
 import mir.entity.EntityList;
 import mir.log.LoggerWrapper;
 import mir.storage.Database;
-import mir.storage.StorageObjectFailure;
+import mir.storage.DatabaseFailure;
 import mircoders.entity.EntityUploadedMedia;
 
 /**
  * <b>implements abstract DB connection to the content_x_media SQL table
  *
  * @author RK, mir-coders group
- * @version $Id: DatabaseContentToMedia.java,v 1.19.2.9 2005/02/10 16:22:22 rhindes Exp $
+ * @version $Id: DatabaseContentToMedia.java,v 1.19.2.10 2005/03/26 11:26:28 zapata Exp $
  *
  */
 
@@ -68,7 +68,7 @@ public class DatabaseContentToMedia extends Database {
   }
 
   public void addMedia(String contentId, String mediaId) throws
-      StorageObjectFailure {
+      DatabaseFailure {
     if (contentId == null && mediaId == null) {
       return;
     }
@@ -87,7 +87,7 @@ public class DatabaseContentToMedia extends Database {
     }
     catch (Exception e) {
       logger.error("-- add media failed -- insert");
-      throw new StorageObjectFailure("-- add media failed -- insert ", e);
+      throw new DatabaseFailure("-- add media failed -- insert ", e);
     }
     finally {
       freeConnection(con, stmt);
@@ -95,7 +95,7 @@ public class DatabaseContentToMedia extends Database {
   }
 
   public void setMedia(String contentId, String mediaId) throws
-      StorageObjectFailure {
+      DatabaseFailure {
     if (contentId == null && mediaId == null) {
       return;
     }
@@ -112,7 +112,7 @@ public class DatabaseContentToMedia extends Database {
     }
     catch (Exception e) {
       logger.error("-- set media failed -- delete");
-      throw new StorageObjectFailure("-- set media failed -- delete ", e);
+      throw new DatabaseFailure("-- set media failed -- delete ", e);
     }
     finally {
       freeConnection(con, stmt);
@@ -131,14 +131,14 @@ public class DatabaseContentToMedia extends Database {
     }
     catch (Exception e) {
       logger.error("-- set media failed -- insert");
-      throw new StorageObjectFailure("-- set media failed -- insert ", e);
+      throw new DatabaseFailure("-- set media failed -- insert ", e);
     }
     finally {
       freeConnection(con, stmt);
     }
   }
 
-  public void deleteByContentId(String contentId) throws StorageObjectFailure {
+  public void deleteByContentId(String contentId) throws DatabaseFailure {
     if (contentId == null) {
       //theLog.printDebugInfo("-- delete topics failed -- no content id");
       return;
@@ -156,7 +156,7 @@ public class DatabaseContentToMedia extends Database {
     }
     catch (Exception e) {
       logger.error("-- delete by contentId failed  ");
-      throw new StorageObjectFailure(
+      throw new DatabaseFailure(
           "-- delete by content id failed -- delete ", e);
     }
     finally {
@@ -164,7 +164,7 @@ public class DatabaseContentToMedia extends Database {
     }
   }
 
-  public void deleteByMediaId(String mediaId) throws StorageObjectFailure {
+  public void deleteByMediaId(String mediaId) throws DatabaseFailure {
 
     if (mediaId == null) {
       //theLog.printDebugInfo("-- delete topics failed -- no topic id");
@@ -184,7 +184,7 @@ public class DatabaseContentToMedia extends Database {
     }
     catch (Exception e) {
       logger.error("-- delete media failed ");
-      throw new StorageObjectFailure("-- delete by media id failed -- ", e);
+      throw new DatabaseFailure("-- delete by media id failed -- ", e);
     }
     finally {
       freeConnection(con, stmt);
@@ -192,7 +192,7 @@ public class DatabaseContentToMedia extends Database {
   }
 
   public void delete(String contentId, String mediaId) throws
-      StorageObjectFailure {
+      DatabaseFailure {
     if (mediaId == null || contentId == null) {
       logger.debug("-- delete media failed -- missing parameter");
       return;
@@ -212,7 +212,7 @@ public class DatabaseContentToMedia extends Database {
     }
     catch (Exception e) {
       logger.error("-- delete content_x_media failed ");
-      throw new StorageObjectFailure("-- delete content_x_media failed -- ", e);
+      throw new DatabaseFailure("-- delete content_x_media failed -- ", e);
     }
     finally {
       freeConnection(con, stmt);
@@ -220,7 +220,7 @@ public class DatabaseContentToMedia extends Database {
   }
 
   public EntityList getContent(EntityUploadedMedia media) throws
-      StorageObjectFailure {
+      DatabaseFailure {
 
     EntityList returnList = null;
     if (media != null) {
@@ -237,7 +237,7 @@ public class DatabaseContentToMedia extends Database {
       }
       catch (Exception e) {
         logger.error("-- get content failed");
-        throw new StorageObjectFailure("-- get content failed -- ", e);
+        throw new DatabaseFailure("-- get content failed -- ", e);
       }
     }
     return returnList;
@@ -247,7 +247,7 @@ public class DatabaseContentToMedia extends Database {
    * Returns a EntityList with all content-objects having a relation to a media
    */
 
-  public EntityList getContent() throws StorageObjectFailure {
+  public EntityList getContent() throws DatabaseFailure {
 
     EntityList returnList = null;
 
@@ -262,7 +262,7 @@ public class DatabaseContentToMedia extends Database {
     }
     catch (Exception e) {
       logger.error("-- get content failed");
-      throw new StorageObjectFailure("-- get content failed -- ", e);
+      throw new DatabaseFailure("-- get content failed -- ", e);
     }
     return returnList;
   }