From: zapata <zapata>
Date: Sat, 8 Mar 2003 05:50:42 +0000 (+0000)
Subject: fixed a malicious earlier fix
X-Git-Tag: BEFORE_MERGE_1_1~236
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=0d25c2cfa852d48f1ac10757dcf76df95b263390;p=mir.git

fixed a malicious earlier fix
---

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