Author: sebb
Date: Sat Aug 13 02:07:10 2011
New Revision: 1157309
URL: http://svn.apache.org/viewvc?rev=1157309&view=rev
Log:
Use simpler Java 1.5+ method to obtain the default charset
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/JMeterTestCase.java
jakarta/jmeter/trunk/test/src/org/apache/jorphan/test/AllTests.java
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/JMeterTestCase.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/JMeterTestCase.java?rev=1157309&r1=1157308&r2=1157309&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/JMeterTestCase.java
(original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/JMeterTestCase.java
Sat Aug 13 02:07:10 2011
@@ -19,7 +19,7 @@
package org.apache.jmeter.junit;
import java.io.File;
-import java.io.OutputStreamWriter;
+import java.nio.charset.Charset;
import java.util.Collection;
import java.util.LinkedList;
import java.util.Locale;
@@ -85,7 +85,7 @@ public abstract class JMeterTestCase ext
logprop("java.home");
logprop("file.encoding");
// Display actual encoding used (will differ if file.encoding is
not recognised)
- System.out.println("default encoding="+new OutputStreamWriter(
System.out ).getEncoding());
+ System.out.println("default encoding="+Charset.defaultCharset());
logprop("user.home");
logprop("user.dir");
logprop("user.language");
Modified: jakarta/jmeter/trunk/test/src/org/apache/jorphan/test/AllTests.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jorphan/test/AllTests.java?rev=1157309&r1=1157308&r2=1157309&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/jorphan/test/AllTests.java
(original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jorphan/test/AllTests.java Sat Aug
13 02:07:10 2011
@@ -22,8 +22,8 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
-import java.io.OutputStreamWriter;
import java.lang.reflect.Method;
+import java.nio.charset.Charset;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
@@ -146,7 +146,7 @@ public final class AllTests {
logprop("java.home", true);
logprop("file.encoding", true);
// Display actual encoding used (will differ if file.encoding is not
recognised)
- String msg = "default encoding="+new OutputStreamWriter( System.out
).getEncoding();
+ String msg = "default encoding="+Charset.defaultCharset();
System.out.println(msg);
log.info(msg);
logprop("user.home");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
