fixed a malicious earlier fix

diff --git a/source/mircoders/entity/EntityImages.java b/source/mircoders/entity/EntityImages.java
index 21c2c75..6ab1d15 100755 (executable)
--- a/source/mircoders/entity/EntityImages.java
+++ b/source/mircoders/entity/EntityImages.java
@@ -55,7 +55,7 @@ import mir.storage.StorageObjectFailure;
  * Diese Klasse enth?lt die Daten eines MetaObjekts\r
  *\r
  * @author RK, mh, mir-coders\r
- * @version $Id: EntityImages.java,v 1.17 2003/03/05 19:16:50 idfx Exp $\r
+ * @version $Id: EntityImages.java,v 1.18 2003/03/08 05:50:42 zapata Exp $\r
  */\r
 \r
 \r
@@ -82,7 +82,7 @@ public class EntityImages extends EntityUploadedMedia
     logger.debug("EntityImages.getimage started");\r
     java.sql.Connection con=null;\r
     Statement stmt=null;\r
-    BlobInputStream in; \r
+    BlobInputStream in;\r
     InputStream img_in = null;\r
     try {\r
       con = theStorageObject.getPooledCon();\r
@@ -103,29 +103,33 @@ public class EntityImages extends EntityUploadedMedia
         }\r
         rs.close();\r
       }\r
-    } catch (SQLException e) {\r
-      logger.error("EntityImages.getImage failed: " + e.toString());\r
-      e.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE));\r
-      throwStorageObjectFailure(e, "EntityImages -- getImage failed: ");\r
-    } finally {\r
-           try {\r
-             con.setAutoCommit(true);\r
-           } catch (SQLException e) {\r
-             logger.error("EntityImages.getIcon resetting transaction mode failed: " + e.toString());\r
-             e.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE));\r
-             throwStorageObjectFailure(e, "EntityImages -- resetting transaction mode failed:");\r
-           }\r
-           try {\r
-             theStorageObject.freeConnection(con, stmt);\r
-           } catch (Throwable e) {\r
-             throwStorageObjectFailure(e, "EntityImages -- freeing connection failed:");\r
-           }\r
-         }\r
+    }\r
+    catch (Throwable t) {\r
+      logger.error("EntityImages.getImage failed: " + t.toString());\r
+      t.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE));\r
+\r
+      try {\r
+        con.setAutoCommit(true);\r
+      }\r
+      catch (Throwable e) {\r
+        logger.error("EntityImages.getImage resetting transaction mode failed: " + e.toString());\r
+        e.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE));\r
+      }\r
+\r
+      try {\r
+        theStorageObject.freeConnection(con, stmt);\r
+      }\r
+      catch (Throwable e) {\r
+        logger.error("EntityImages.getImage freeing connection failed: " +e.toString());\r
+      }\r
+\r
+      throwStorageObjectFailure(t, "EntityImages -- getImage failed: ");\r
+    }\r
     return img_in;\r
   }\r
 \r
   public void setImage(InputStream in, String type)\r
-       throws StorageObjectFailure {\r
+        throws StorageObjectFailure {\r
 \r
     if (in != null) {\r
       Connection con = null;\r
@@ -196,7 +200,7 @@ public class EntityImages extends EntityUploadedMedia
     Statement stmt=null;\r
     BlobInputStream in=null;\r
     ImageInputStream img_in=null;\r
-    \r
+\r
     try {\r
       con = theStorageObject.getPooledCon();\r
       con.setAutoCommit(false);\r
@@ -216,24 +220,28 @@ public class EntityImages extends EntityUploadedMedia
         }\r
         rs.close();\r
       }\r
-    } catch (SQLException e) {\r
-      logger.error("EntityImages.getIcon failed: "+e.toString());\r
-      e.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE));\r
-      throwStorageObjectFailure(e, "EntityImages -- getIcon failed:");\r
-    } finally {\r
+    }\r
+    catch (Throwable t) {\r
+      logger.error("EntityImages.getIcon failed: "+t.toString());\r
+      t.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE));\r
+\r
       try {\r
         con.setAutoCommit(true);\r
-      } catch (SQLException e) {\r
+      }\r
+      catch (SQLException e) {\r
         logger.error("EntityImages.getIcon resetting transaction mode failed: " + e.toString());\r
         e.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE));\r
-        throwStorageObjectFailure(e, "EntityImages -- resetting transaction mode failed:");\r
       }\r
-                       try {\r
+      try {\r
         theStorageObject.freeConnection(con, stmt);\r
-      } catch (Throwable e) {\r
-        throwStorageObjectFailure(e, "EntityImages -- freeing connection failed:");\r
       }\r
+      catch (Throwable e) {\r
+       logger.error("EntityImages -- freeing connection failed: " + e.getMessage());\r
+      }\r
+\r
+      throwStorageObjectFailure(t, "EntityImages -- getIcon failed:");\r
     }\r
+\r
     return img_in;\r
   }\r
 \r