close some more streams after use

wocommunity · Oct 4, 2012 · 7a519d8 · 7a519d8
1 parent 53a0701
commit 7a519d8
Show file tree

Hide file tree

Showing 15 changed files with 71 additions and 13 deletions.
diff --git a/Frameworks/Ajax/ERJQuery/Sources/er/jquery/widgets/AjaxUpload.java b/Frameworks/Ajax/ERJQuery/Sources/er/jquery/widgets/AjaxUpload.java
@@ -5,6 +5,8 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 
+import org.apache.commons.io.IOExceptionWithCause;
+
 import com.webobjects.appserver.WOComponent;
 import com.webobjects.appserver.WOContext;
 import com.webobjects.appserver.WOMultipartIterator;
@@ -235,13 +237,18 @@ public void takeValuesFromRequest(WORequest request, WOContext context) {
 								tempFile = ERXFileUtilities.writeInputStreamToTempFile(anInputStream, context.session().sessionID(), ".tmp");
 							} catch (IOException e) {
 								throw new RuntimeException("Couldn't write input stream to temp file: " + e);
+							} finally {
+								try { anInputStream.close(); } catch (IOException e) {}
 							}
 						} else {
 							OutputStream anOutputStream = (OutputStream) valueForBinding(Bindings.outputStream);
 							try {
 								ERXFileUtilities.writeInputStreamToOutputStream(anInputStream, anOutputStream);
 							} catch (IOException e) {
 								throw new RuntimeException("Couldn't write input stream to output stream: " + e);
+							} finally {
+								try { anOutputStream.close(); } catch (IOException e) {}
+								try { anInputStream.close(); } catch (IOException e) {}
 							}
 						}
 
@@ -267,6 +274,8 @@ public void takeValuesFromRequest(WORequest request, WOContext context) {
 					}
 					catch (IOException e) {
 						throw new RuntimeException("Error skipping empty file upload: " + e);
+					} finally {
+						try { anInputStream.close(); } catch (IOException e) {}
 					}
 				}
 			}

diff --git a/Frameworks/Ajax/ERJQuery/Sources/er/jquery/widgets/FileUploader.java b/Frameworks/Ajax/ERJQuery/Sources/er/jquery/widgets/FileUploader.java
@@ -217,6 +217,9 @@ public void takeValuesFromRequest(WORequest request, WOContext context) {
 							} catch (IOException e) {
 								exception = new RuntimeException("Couldn't write input stream to output stream: " + e);
 								throw exception;
+							} finally {
+								try { anOutputStream.close(); } catch (IOException e) {}
+								try { anInputStream.close(); } catch (IOException e) {}
 							}
 						} else {
 							if (hasBinding(Bindings.finalFilePath)) {
@@ -228,6 +231,8 @@ public void takeValuesFromRequest(WORequest request, WOContext context) {
 							} catch (IOException e) {
 								exception = new RuntimeException("Couldn't write input stream to temp file: " + e);
 								throw exception;
+							} finally {
+								try { anInputStream.close(); } catch (IOException e) {}
 							}
 						}
 
@@ -256,7 +261,9 @@ public void takeValuesFromRequest(WORequest request, WOContext context) {
 					catch (IOException e) {
 						exception = new RuntimeException("Error skipping empty file upload: " + e);
 						throw exception;
-					} 
+					} finally {
+						try { anInputStream.close(); } catch (IOException e) {}
+					}
 				}
 			}
 

diff --git a/Frameworks/Ajax/ERPrototaculous/Sources/er/prototaculous/widgets/AjaxUpload.java b/Frameworks/Ajax/ERPrototaculous/Sources/er/prototaculous/widgets/AjaxUpload.java
@@ -236,13 +236,18 @@ public void takeValuesFromRequest(WORequest request, WOContext context) {
 								tempFile = ERXFileUtilities.writeInputStreamToTempFile(anInputStream, context.session().sessionID(), ".tmp");
 							} catch (IOException e) {
 								throw new RuntimeException("Couldn't write input stream to temp file: " + e);
+							} finally {
+								try { anInputStream.close(); } catch (IOException e) {}
 							}
 						} else {
 							OutputStream anOutputStream = (OutputStream) valueForBinding(Bindings.outputStream);
 							try {
 								ERXFileUtilities.writeInputStreamToOutputStream(anInputStream, anOutputStream);
 							} catch (IOException e) {
 								throw new RuntimeException("Couldn't write input stream to output stream: " + e);
+							} finally {
+								try { anOutputStream.close(); } catch (IOException e) {}
+								try { anInputStream.close(); } catch (IOException e2) {}
 							}
 						}
 
@@ -268,6 +273,8 @@ public void takeValuesFromRequest(WORequest request, WOContext context) {
 					}
 					catch (IOException e) {
 						throw new RuntimeException("Error skipping empty file upload: " + e);
+					} finally {
+						try { anInputStream.close(); } catch (IOException e2) {}
 					}
 				}
 			}

diff --git a/.../BusinessLogic/ERAttachment/Sources/com/rackspacecloud/client/cloudfiles/FilesObject.java b/.../BusinessLogic/ERAttachment/Sources/com/rackspacecloud/client/cloudfiles/FilesObject.java
@@ -202,6 +202,9 @@ public long writeObjectToFile (File localFile) throws FileNotFoundException, Htt
         if (ret == -1)
         {
         	out.write(data, 0, data.length);
+            out.flush();
+            out.close();
+            in.close ();
         	return data.length;
         }
 

diff --git a/...ks/BusinessLogic/ERAttachment/Sources/com/rackspacecloud/client/cloudfiles/FilesUtil.java b/...ks/BusinessLogic/ERAttachment/Sources/com/rackspacecloud/client/cloudfiles/FilesUtil.java
@@ -42,7 +42,11 @@ private static synchronized void loadPropertiesFromClasspath() throws IOExceptio
         {
             throw new FileNotFoundException("Property file '" + file + "' not found in the classpath.");
         }
-        loadProperties(io);
+        try {
+        	loadProperties(io);
+        } finally {
+        	io.close();
+        }
     }
 
 

diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXApplication.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXApplication.java
@@ -422,8 +422,9 @@ private Properties readProperties(NSBundle bundle, String name) {
 				return bundle.properties();
 			}
 
+			InputStream inputStream = null;
 			try {
-				InputStream inputStream = bundle.inputStreamForResourcePath(name);
+				inputStream = bundle.inputStreamForResourcePath(name);
 				if(inputStream == null) {
 					return null;
 				}
@@ -438,6 +439,10 @@ private Properties readProperties(NSBundle bundle, String name) {
 			}
 			catch (IOException exception) {
 				return null;
+			} finally {
+				if (inputStream != null) {
+					try { inputStream.close(); } catch (IOException e) {}
+				}
 			}
 		}
 

diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/foundation/ERXStringUtilities.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/foundation/ERXStringUtilities.java
@@ -487,12 +487,17 @@ public static String stringFromResource(String name, String extension, NSBundle
         }
         path = bundle.resourcePathForLocalizedResourceNamed(name + (extension == null || extension.length() == 0 ? "" : "." + extension), null);
         if(path != null) {
+        	InputStream stream = null;
             try {
-                InputStream stream = bundle.inputStreamForResourcePath(path);
+                stream = bundle.inputStreamForResourcePath(path);
                 byte bytes[] = ERXFileUtilities.bytesFromInputStream(stream);
                 return new String(bytes);
             } catch (IOException e) {
                 log.warn("IOException when stringFromResource(" + name + "." + extension + " in bundle " + bundle.name());
+            } finally {
+            	if (stream != null) {
+            		try { stream.close(); } catch (IOException e) {}
+            	}
             }
         }
         return null;

diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/jdbc/ERXJDBCUtilities.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/jdbc/ERXJDBCUtilities.java
@@ -319,8 +319,10 @@ protected void copyEntity(EOEntity entity) throws SQLException {
 									tempFile.delete();
 
 							continue;
+						} finally {
+							try { bis.close(); } catch (IOException e) {}
 						}
-						FileInputStream fis;
+						FileInputStream fis = null;
 						try {
 							fis = new FileInputStream(tempFile);
 						}
@@ -332,6 +334,10 @@ protected void copyEntity(EOEntity entity) throws SQLException {
 									tempFile.delete();
 
 							continue;
+						} finally {
+							if (fis != null) {
+								try { fis.close(); } catch (IOException e) {}
+							}
 						}
 						upps.setBinaryStream(i + 1, fis, (int) tempFile.length());
 						tempfilesToDelete.addObject(tempFile);

diff --git a/Frameworks/Core/JavaWOExtensions/Sources/com/webobjects/woextensions/WOExceptionParser.java b/Frameworks/Core/JavaWOExtensions/Sources/com/webobjects/woextensions/WOExceptionParser.java
@@ -164,7 +164,7 @@ private static String _stringFromFileSafely(String path) {
         } catch (java.io.IOException e) {
             return null;
         } finally {
-            if (f != null) {
+            if (fis != null) {
                 try {
                     fis.close();
                 } catch (java.io.IOException e) {
@@ -173,15 +173,12 @@ private static String _stringFromFileSafely(String path) {
                         NSLog.debug.appendln(e);
                     }
                 }
-
-                f = null;
             }
         }
 
         if (bytesRead == 0)
             return null;
-        else
-            return new String(data);
+        return new String(data);
     }
 
     /**
@@ -210,7 +207,7 @@ protected static String _stringFromFile(String path) {
         } catch (IOException e) {
             throw NSForwardException._runtimeExceptionForThrowable(e);
         } finally {
-            if (f != null) {
+            if (fis != null) {
                 try {
                     fis.close();
                 } catch (IOException e) {
@@ -219,8 +216,6 @@ protected static String _stringFromFile(String path) {
                         NSLog.debug.appendln(e);
                     }
                 }
-
-                f = null;
             }
 
         }

diff --git a/Frameworks/EOF/ERCaching/Sources/com/meetup/memcached/MemcachedClient.java b/Frameworks/EOF/ERCaching/Sources/com/meetup/memcached/MemcachedClient.java
@@ -1383,6 +1383,9 @@ public Object get( String key, Integer hashCode, boolean asString ) {
 							log.error( "++++ ClassNotFoundException thrown while trying to deserialize for key: " + key, e );
 							throw new NestedIOException( "+++ failed while trying to deserialize for key: " + key, e );
 						}
+						finally {
+							ois.close();
+						}
 					}
 				}
 				else if ( END.equals( line ) ) {
@@ -1726,6 +1729,9 @@ private void loadMulti( LineInputStream input, Map<String,Object> hm, boolean as
 						log.error( "++++ ClassNotFoundException thrown while trying to deserialize for key: " + key, e );
 						throw new NestedIOException( "+++ failed while trying to deserialize for key: " + key, e );
 					}
+					finally {
+						ois.close();
+					}
 				}
 
 				// store the object into the cache

diff --git a/Frameworks/PlugIns/DB2PlugIn/Sources/com/webobjects/jdbcadaptor/DB2PlugIn.java b/Frameworks/PlugIns/DB2PlugIn/Sources/com/webobjects/jdbcadaptor/DB2PlugIn.java
@@ -106,6 +106,8 @@ public NSDictionary jdbcInfo() {
       }
       catch (IOException e) {
         throw new RuntimeException("Failed to load 'JDBCInfo.plist' from this plugin jar.", e);
+      } finally {
+    	  try { jdbcInfoStream.close(); } catch (IOException e) {}
       }
     }
     else {

diff --git a/Frameworks/PlugIns/DerbyPlugIn/Sources/com/webobjects/jdbcadaptor/_DerbyPlugIn.java b/Frameworks/PlugIns/DerbyPlugIn/Sources/com/webobjects/jdbcadaptor/_DerbyPlugIn.java
@@ -424,6 +424,8 @@ public NSDictionary jdbcInfo() {
 			}
 			catch (IOException e) {
 				throw new RuntimeException("Failed to load 'JDBCInfo.plist' from this plugin jar: " + e, e);
+			} finally {
+				try { jdbcInfoStream.close(); } catch (IOException e) {}
 			}
 		}
 		else {

diff --git a/Frameworks/PlugIns/FrontBasePlugIn/Sources/com/webobjects/jdbcadaptor/_FrontBasePlugIn.java b/Frameworks/PlugIns/FrontBasePlugIn/Sources/com/webobjects/jdbcadaptor/_FrontBasePlugIn.java
@@ -243,6 +243,8 @@ public NSDictionary<String, Object> jdbcInfo() {
 			}
 			catch (IOException e) {
 				throw new RuntimeException("Failed to load 'FrontBaseJDBCInfo.plist' from this plugin jar.", e);
+			} finally {
+				try { jdbcInfoStream.close(); } catch (IOException e) {}
 			}
 		}
 		else {

diff --git a/Frameworks/PlugIns/H2PlugIn/Sources/com/webobjects/jdbcadaptor/_H2PlugIn.java b/Frameworks/PlugIns/H2PlugIn/Sources/com/webobjects/jdbcadaptor/_H2PlugIn.java
@@ -642,6 +642,9 @@ public NSDictionary jdbcInfo() {
 			catch (IOException e) {
 				throw new RuntimeException("Failed to load 'H2JDBCInfo.plist' from this plugin jar: " + e, e);
 			}
+			finally {
+				try { jdbcInfoStream.close(); } catch (IOException e) {}
+			}
 		}
 		else {
 			jdbcInfo = super.jdbcInfo();

diff --git a/Frameworks/PlugIns/MySQLPlugIn/Sources/com/webobjects/jdbcadaptor/_MySQLPlugIn.java b/Frameworks/PlugIns/MySQLPlugIn/Sources/com/webobjects/jdbcadaptor/_MySQLPlugIn.java
@@ -708,6 +708,8 @@ public NSDictionary<String, Object> jdbcInfo() {
 				jdbcInfo = (NSDictionary<String, Object>) NSPropertyListSerialization.propertyListFromData(new NSData(jdbcInfoStream, 2048), "US-ASCII");
 			} catch (IOException e) {
 				throw new RuntimeException("Failed to load 'JDBCInfo.plist' from this plugin jar.", e);
+			} finally {
+				try { jdbcInfoStream.close(); } catch (IOException e) {}
 			}
 
 	    } else {