svn commit: r533429 - in /incubator/ivy/core/trunk/src/java/org/apache/ivy/core: deliver/DeliverEngine.java resolve/ResolveEngine.java

[ma...@apache.org]

Author: maartenc
Date: Sat Apr 28 14:47:59 2007
New Revision: 533429

URL: http://svn.apache.org/viewvc?view=rev&rev=533429
Log:
Properly close InputStream/OutputStream.
These unclosed streams caused some of my junit tests to fail.

Modified:
    incubator/ivy/core/trunk/src/java/org/apache/ivy/core/deliver/DeliverEngine.java
    incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveEngine.java

Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/deliver/DeliverEngine.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/deliver/DeliverEngine.java?view=diff&rev=533429&r1=533428&r2=533429
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/deliver/DeliverEngine.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/deliver/DeliverEngine.java Sat Apr 28 14:47:59 2007
@@ -115,7 +115,9 @@
             throw new IllegalStateException("ivy properties not found in cache for "+mrid+": please resolve dependencies before publishing ("+ivyFile+")");
         }
         Properties props = new Properties();
-        props.load(new FileInputStream(ivyProperties));
+        FileInputStream in = new FileInputStream(ivyProperties);
+        props.load(in);
+        in.close();
         
         for (Iterator iter = props.keySet().iterator(); iter.hasNext();) {
             String depMridStr = (String)iter.next();
@@ -150,7 +152,7 @@
         try {
             XmlModuleDescriptorUpdater.update(_settings, ivyFileURL, 
                     new File(publishedIvy),
-                    resolvedDependencies, options.getStatus(), revision, options.getPubdate(), null, true);
+                    resolvedDependencies, options.getStatus(), revision, options.getPubdate(), null, true, null);
         } catch (SAXException ex) {
             throw new RuntimeException("bad ivy file in cache for "+mrid+": please clean and resolve again" , ex);
         }

Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveEngine.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveEngine.java?view=diff&rev=533429&r1=533428&r2=533429
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveEngine.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveEngine.java Sat Apr 28 14:47:59 2007
@@ -215,7 +215,9 @@
             		}
             	}
             }
-            props.store(new FileOutputStream(ivyPropertiesInCache), md.getResolvedModuleRevisionId()+ " resolved revisions");
+            FileOutputStream out = new FileOutputStream(ivyPropertiesInCache);
+            props.store(out, md.getResolvedModuleRevisionId()+ " resolved revisions");
+            out.close();
             Message.verbose("\tresolved ivy file produced in "+ivyFileInCache);
             
             report.setResolveTime(System.currentTimeMillis()-start);