aboutsummaryrefslogtreecommitdiff
path: root/sql/core
diff options
context:
space:
mode:
authorYin Huai <yhuai@databricks.com>2016-01-15 16:03:05 -0800
committerYin Huai <yhuai@databricks.com>2016-01-15 16:03:05 -0800
commitf6ddbb360ac6ac2778bbdbebbf2fcccabe73349b (patch)
treed9707de2fae783d482981c304b1282f32c6fdf4b /sql/core
parent5f843781e3e7581c61b7e235d4041d85e8e48c7e (diff)
downloadspark-f6ddbb360ac6ac2778bbdbebbf2fcccabe73349b.tar.gz
spark-f6ddbb360ac6ac2778bbdbebbf2fcccabe73349b.tar.bz2
spark-f6ddbb360ac6ac2778bbdbebbf2fcccabe73349b.zip
[SPARK-12833][HOT-FIX] Reset the locale after we set it.
Author: Yin Huai <yhuai@databricks.com> Closes #10778 from yhuai/resetLocale.
Diffstat (limited to 'sql/core')
-rw-r--r--sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/csv/CSVTypeCastSuite.scala13
1 files changed, 9 insertions, 4 deletions
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/csv/CSVTypeCastSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/csv/CSVTypeCastSuite.scala
index 40c5ccd0f7..c28a25057e 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/csv/CSVTypeCastSuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/csv/CSVTypeCastSuite.scala
@@ -90,9 +90,14 @@ class CSVTypeCastSuite extends SparkFunSuite {
}
test("Float and Double Types are cast correctly with Locale") {
- val locale : Locale = new Locale("fr", "FR")
- Locale.setDefault(locale)
- assert(CSVTypeCast.castTo("1,00", FloatType) == 1.0)
- assert(CSVTypeCast.castTo("1,00", DoubleType) == 1.0)
+ val originalLocale = Locale.getDefault
+ try {
+ val locale : Locale = new Locale("fr", "FR")
+ Locale.setDefault(locale)
+ assert(CSVTypeCast.castTo("1,00", FloatType) == 1.0)
+ assert(CSVTypeCast.castTo("1,00", DoubleType) == 1.0)
+ } finally {
+ Locale.setDefault(originalLocale)
+ }
}
}