You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ni...@apache.org on 2010/10/06 04:02:17 UTC
svn commit: r1004875 -
/commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/XmlStreamReaderTest.java
Author: niallp
Date: Wed Oct 6 02:02:16 2010
New Revision: 1004875
URL: http://svn.apache.org/viewvc?rev=1004875&view=rev
Log:
Remove unnecessary try/finally
Modified:
commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/XmlStreamReaderTest.java
Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/XmlStreamReaderTest.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/XmlStreamReaderTest.java?rev=1004875&r1=1004874&r2=1004875&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/XmlStreamReaderTest.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/XmlStreamReaderTest.java Wed Oct 6 02:02:16 2010
@@ -216,19 +216,16 @@ public class XmlStreamReaderTest extends
public void _testAlternateDefaultEncoding(String cT, String bomEnc,
String streamEnc, String prologEnc, String alternateEnc)
throws Exception {
- try {
- InputStream is = getXmlStream(bomEnc, (prologEnc == null) ? XML1
- : XML3, streamEnc, prologEnc);
- XmlStreamReader xmlReader = new XmlStreamReader(is, cT, false, alternateEnc);
- if (!streamEnc.equals("UTF-16")) {
- // we can not assert things here because UTF-8, US-ASCII and
- // ISO-8859-1 look alike for the chars used for detection
- } else {
- //String enc = (alternateEnc != null) ? alternateEnc : streamEnc;
- assertEquals(xmlReader.getEncoding().substring(0,
- streamEnc.length()), streamEnc);
- }
- } finally {
+ InputStream is = getXmlStream(bomEnc, (prologEnc == null) ? XML1
+ : XML3, streamEnc, prologEnc);
+ XmlStreamReader xmlReader = new XmlStreamReader(is, cT, false, alternateEnc);
+ if (!streamEnc.equals("UTF-16")) {
+ // we can not assert things here because UTF-8, US-ASCII and
+ // ISO-8859-1 look alike for the chars used for detection
+ } else {
+ //String enc = (alternateEnc != null) ? alternateEnc : streamEnc;
+ assertEquals(xmlReader.getEncoding().substring(0,
+ streamEnc.length()), streamEnc);
}
}