Author: maartenc Date: Mon Dec 21 23:07:00 2009 New Revision: 893024 URL: http://svn.apache.org/viewvc?rev=893024&view=rev Log: FIX: Ivy does not close URL connection to ivy-report.xsl properly (IVY-1152)
Modified: ant/ivy/core/trunk/CHANGES.txt ant/ivy/core/trunk/src/java/org/apache/ivy/util/url/BasicURLHandler.java Modified: ant/ivy/core/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=893024&r1=893023&r2=893024&view=diff ============================================================================== --- ant/ivy/core/trunk/CHANGES.txt (original) +++ ant/ivy/core/trunk/CHANGES.txt Mon Dec 21 23:07:00 2009 @@ -102,6 +102,7 @@ - IMPROVEMENT: Trace a message when a property file referenced from the settings doesn't exixts (IVY-1074) - IMPROVEMENT: use defaultconf in combination with defaultconfmapping (IVY-1135) (thanks to Jon Schneider) +- FIX: Ivy does not close URL connection to ivy-report.xsl properly (IVY-1152) - FIX: Artifact report throws NPE when artifact is not in cache (IVY-1150) (thanks to Steve Jones) - FIX: resolve fails for transitive relocated maven modules when the type of the dependency was set to 'jar' - FIX: optional dependencies, sources and javadocs aren't resolved when a maven module is relocated Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/util/url/BasicURLHandler.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/util/url/BasicURLHandler.java?rev=893024&r1=893023&r2=893024&view=diff ============================================================================== --- ant/ivy/core/trunk/src/java/org/apache/ivy/util/url/BasicURLHandler.java (original) +++ ant/ivy/core/trunk/src/java/org/apache/ivy/util/url/BasicURLHandler.java Mon Dec 21 23:07:00 2009 @@ -215,13 +215,7 @@ } ((HttpURLConnection) con).disconnect(); - } else if (con != null - && "sun.net.www.protocol.file.FileURLConnection".equals(con.getClass().getName())) { - // ugly fix for a sun jre bug: - // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4257700 - // - // getting header info on the fileurlconnection opens the connection, - // which opens a file input stream without closing it. + } else if (con != null) { try { con.getInputStream().close(); } catch (IOException e) {