You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2014/12/29 13:39:05 UTC
svn commit: r1648322 - in /commons/proper/imaging/trunk/src:
main/java/org/apache/commons/imaging/formats/icns/
main/java/org/apache/commons/imaging/formats/ico/
test/java/org/apache/commons/imaging/examples/
test/java/org/apache/commons/imaging/format...
Author: sebb
Date: Mon Dec 29 12:39:04 2014
New Revision: 1648322
URL: http://svn.apache.org/r1648322
Log:
Ensure resources are closed
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ApacheImagingSpeedAndMemoryTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java?rev=1648322&r1=1648321&r2=1648322&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java Mon Dec 29 12:39:04 2014
@@ -342,6 +342,7 @@ public class IcnsImageParser extends Ima
bos.write(argb >> 24);
}
}
+ bos.close();
}
/**
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java?rev=1648322&r1=1648321&r2=1648322&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java Mon Dec 29 12:39:04 2014
@@ -810,6 +810,7 @@ public class IcoImageParser extends Imag
bos.write(0);
}
}
+ bos.close();
}
/**
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ApacheImagingSpeedAndMemoryTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ApacheImagingSpeedAndMemoryTest.java?rev=1648322&r1=1648321&r2=1648322&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ApacheImagingSpeedAndMemoryTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ApacheImagingSpeedAndMemoryTest.java Mon Dec 29 12:39:04 2014
@@ -264,6 +264,8 @@ public class ApacheImagingSpeedAndMemory
} catch (final IOException ioex) {
ioex.printStackTrace();
System.exit(-1);
+ } finally {
+ fmt.close();
}
try {
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java?rev=1648322&r1=1648321&r2=1648322&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java Mon Dec 29 12:39:04 2014
@@ -112,6 +112,7 @@ public class IcoRoundtripTest extends Ic
bos.write(0);
}
bos.flush();
+ bos.close();
return byteArrayStream.toByteArray();
}
}
@@ -146,6 +147,7 @@ public class IcoRoundtripTest extends Ic
bos.write(0);
}
bos.flush();
+ bos.close();
return byteArrayStream.toByteArray();
}
}
@@ -179,6 +181,7 @@ public class IcoRoundtripTest extends Ic
bos.write(0);
}
bos.flush();
+ bos.close();
return byteArrayStream.toByteArray();
}
}
@@ -216,6 +219,7 @@ public class IcoRoundtripTest extends Ic
bos.write(0);
}
bos.flush();
+ bos.close();
return byteArrayStream.toByteArray();
}
}
@@ -249,6 +253,7 @@ public class IcoRoundtripTest extends Ic
bos.write(0);
}
bos.flush();
+ bos.close();
return byteArrayStream.toByteArray();
}
}
@@ -290,6 +295,7 @@ public class IcoRoundtripTest extends Ic
}
}
bos.flush();
+ bos.close();
return byteArrayStream.toByteArray();
}
}