bugfixes mainly...

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

diff --git a/source/mircoders/storage/DatabaseImageFormat.java b/source/mircoders/storage/DatabaseImageFormat.java
index 854c406..346ecb5 100755 (executable)
--- a/source/mircoders/storage/DatabaseImageFormat.java
+++ b/source/mircoders/storage/DatabaseImageFormat.java
@@ -22,7 +22,11 @@ public class DatabaseImageFormat extends Database implements StorageObject{
        private static DatabaseImageFormat instance;
        private static SimpleList publisherPopupData;
 
-       public static DatabaseImageFormat getInstance() throws StorageObjectException
+       // the following *has* to be sychronized cause this static method
+       // could get preemted and we could end up with 2 instances of DatabaseFoo..
+       // see the "Singletons with needles and thread" article at JavaWorld -mh
+       public synchronized static DatabaseImageFormat getInstance() 
+         throws StorageObjectException
        {
                if (instance == null) {
                        instance = new DatabaseImageFormat();
@@ -36,11 +40,10 @@ public class DatabaseImageFormat extends Database implements StorageObject{
                super();
                this.hasTimestamp = false;
                this.theTable="img_format";
-               try { this.theEntityClass = Class.forName("mir.entity.EntityImageFormat");      }
-               catch (Exception e) { throw new StorageObjectException(e.toString());   }
        }
 
-       public SimpleList getPopupData() { return getPopupData("name",true); }
+       public SimpleList getPopupData()
+        throws StorageObjectException { return getPopupData("name",true); }
 
 
 }