From 9ac26c4626f906f4b561ec1fe9c308a0cf905608 Mon Sep 17 00:00:00 2001 From: Som Snytt Date: Fri, 15 Jul 2016 19:52:57 -0700 Subject: SI-9750 Tweak tests for what is a number Leaves the error string as is, but adds test to show how it looks. Java calls it a version number. `Not a version: 1.9`. Don't strip `1.` prefix recursively. (That was Snytt's fault.) --- src/library/scala/util/Properties.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/library/scala/util/Properties.scala b/src/library/scala/util/Properties.scala index 6995f452fa..fb28132dfe 100644 --- a/src/library/scala/util/Properties.scala +++ b/src/library/scala/util/Properties.scala @@ -185,7 +185,7 @@ private[scala] trait PropertiesTrait { def isJavaAtLeast(version: String): Boolean = { def versionOf(s: String): Int = s.indexOf('.') match { case 1 if s.charAt(0) == '1' => - val v = versionOf(s.substring(2)) + val v = s.substring(2).toInt if (v < 9) v else -1 case -1 => s.toInt case _ => -1 -- cgit v1.2.3