Author: tchemit Date: 2010-11-21 12:07:56 +0100 (Sun, 21 Nov 2010) New Revision: 790 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/790 Log: Anomalie #1086: Always Close IO streams Modified: trunk/src/main/java/org/nuiton/io/SortedProperties.java trunk/src/test/java/org/nuiton/io/xpp3/Xpp3HelperTest.java trunk/src/test/java/org/nuiton/io/xpp3/Xpp3ReaderTest.java Modified: trunk/src/main/java/org/nuiton/io/SortedProperties.java =================================================================== --- trunk/src/main/java/org/nuiton/io/SortedProperties.java 2010-11-20 14:19:50 UTC (rev 789) +++ trunk/src/main/java/org/nuiton/io/SortedProperties.java 2010-11-21 11:07:56 UTC (rev 790) @@ -164,10 +164,15 @@ @Override public void store(OutputStream out, String comments) throws IOException { - store0(new BufferedWriter(new OutputStreamWriter(out, encoding)), -// store0(new BufferedWriter(new OutputStreamWriter(out, "8859_1")), -comments, -true); + BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(out, encoding)); + try { + store0(writer, + // store0(new BufferedWriter(new OutputStreamWriter(out, "8859_1")), + comments, + true); + } finally { + writer.close(); + } } protected void store0(BufferedWriter bw, String comments, boolean escUnicode) Modified: trunk/src/test/java/org/nuiton/io/xpp3/Xpp3HelperTest.java =================================================================== --- trunk/src/test/java/org/nuiton/io/xpp3/Xpp3HelperTest.java 2010-11-20 14:19:50 UTC (rev 789) +++ trunk/src/test/java/org/nuiton/io/xpp3/Xpp3HelperTest.java 2010-11-21 11:07:56 UTC (rev 790) @@ -75,9 +75,14 @@ Assert.assertTrue(file.exists()); Reader input = new FileReader(file); - Assert.assertNotNull(input); - Xpp3Helper.readObject(null, input); + try { + Assert.assertNotNull(input); + + Xpp3Helper.readObject(null, input); + } finally { + input.close(); + } } @Test(expected = IllegalArgumentException.class) @@ -87,9 +92,13 @@ Assert.assertTrue(file.exists()); Reader input = new FileReader(file); - Assert.assertNotNull(input); + try { + Assert.assertNotNull(input); - Xpp3Helper.readObject(String.class, input); + Xpp3Helper.readObject(String.class, input); + } finally { + input.close(); + } } @Test @@ -98,10 +107,15 @@ File file = new File(Xpp3ReaderTest.dir, "identity.xml"); Assert.assertTrue(file.exists()); + Identity result; Reader input = new FileReader(file); - Assert.assertNotNull(input); + try { + Assert.assertNotNull(input); - Identity result = Xpp3Helper.readObject(Identity.class, input); + result = Xpp3Helper.readObject(Identity.class, input); + } finally { + input.close(); + } Xpp3ReaderTest.assertEqualsSimpleIdentity(result); } @@ -121,9 +135,13 @@ Assert.assertTrue(file.exists()); Reader input = new FileReader(file); - Assert.assertNotNull(input); + try { + Assert.assertNotNull(input); - Xpp3Helper.readObjects(null, input); + Xpp3Helper.readObjects(null, input); + } finally { + input.close(); + } } @Test(expected = IllegalArgumentException.class) @@ -133,18 +151,27 @@ Assert.assertTrue(file.exists()); Reader input = new FileReader(file); - Assert.assertNotNull(input); + try { + Assert.assertNotNull(input); - Xpp3Helper.readObjects(String.class, input); + Xpp3Helper.readObjects(String.class, input); + } finally { + input.close(); + } } @Test public void testReadObjects() throws Exception { File file = new File(Xpp3ReaderTest.dir, "identities.xml"); + Identity[] result; Reader input = new FileReader(file); - Assert.assertNotNull(input); - Identity[] result = Xpp3Helper.readObjects(Identity.class, input); + try { + Assert.assertNotNull(input); + result = Xpp3Helper.readObjects(Identity.class, input); + } finally { + input.close(); + } Xpp3ReaderTest.assertEqualsIdentities(result); } Modified: trunk/src/test/java/org/nuiton/io/xpp3/Xpp3ReaderTest.java =================================================================== --- trunk/src/test/java/org/nuiton/io/xpp3/Xpp3ReaderTest.java 2010-11-20 14:19:50 UTC (rev 789) +++ trunk/src/test/java/org/nuiton/io/xpp3/Xpp3ReaderTest.java 2010-11-21 11:07:56 UTC (rev 790) @@ -65,9 +65,14 @@ File file = new File(dir, "identity.xml"); + Identity result; Reader input = new FileReader(file); - Assert.assertNotNull(input); - Identity result = r.read(input); + try { + Assert.assertNotNull(input); + result = r.read(input); + } finally { + input.close(); + } Assert.assertNotNull(result); Identity expected = new Identity(); expected.setFirstName("first name"); @@ -84,9 +89,13 @@ File file = new File(dir, "identities.xml"); Reader input = new FileReader(file); - Assert.assertNotNull(input); - Identity[] result = r.readArray(input); - assertEqualsIdentities(result); + try { + Assert.assertNotNull(input); + Identity[] result = r.readArray(input); + assertEqualsIdentities(result); + } finally { + input.close(); + } } @@ -98,18 +107,33 @@ File file = new File(dir, "identities2.xml"); Assert.assertTrue(file.exists()); + Identity[] result; Reader input = new FileReader(file); - Assert.assertNotNull(input); - Identity[] result = r.readArray(input); + try { + Assert.assertNotNull(input); + result = r.readArray(input); + } finally { + input.close(); + } assertEqualsIdentities(result); r.setAddDefaultEntities(false); - result = r.readArray(new FileReader(file)); + input = new FileReader(file); + try { + result = r.readArray(input); + } finally { + input.close(); + } assertEqualsIdentities(result); r.setAddDefaultEntities(true); - result = r.readArray(new FileReader(file)); + input = new FileReader(file); + try { + result = r.readArray(input); + } finally { + input.close(); + } assertEqualsIdentities(result); @@ -117,8 +141,12 @@ r.setParentRootTagName("identities"); input = new FileReader(new File(dir, "identities.xml")); - Assert.assertNotNull(input); - result = r.readArray(input); + try { + Assert.assertNotNull(input); + result = r.readArray(input); + } finally { + input.close(); + } assertEqualsIdentities(result); }