Publish 2.0.0-M5, Fix #47: Test failures on TestDateTimeFormatters on Scala 2.12

cquiroz · soc · commit cf6e0bbbc5df · 2016-11-08T01:18:28.000+01:00
diff --git a/README.md b/README.md
@@ -53,8 +53,8 @@ Scala 2.10, 2.11, and 2.12 are supported.
 
 To get started with SBT, add one (or both) of these dependencies:
 
-- `libraryDependencies += "io.github.soc" %%  "scala-java-time" % "2.0.0-M4"` (for Scala)
-- `libraryDependencies += "io.github.soc" %%% "scala-java-time" % "2.0.0-M4"` (for Scala.js, [Scala.js plugin](http://www.scala-js.org/tutorial/basic/#sbt-setup) required)
+- `libraryDependencies += "io.github.soc" %%  "scala-java-time" % "2.0.0-M5"` (for Scala)
+- `libraryDependencies += "io.github.soc" %%% "scala-java-time" % "2.0.0-M5"` (for Scala.js, [Scala.js plugin](http://www.scala-js.org/tutorial/basic/#sbt-setup) required)
 
 #### Building
 This project builds using sbt.
diff --git a/build.sbt b/build.sbt
@@ -7,7 +7,7 @@ val crossScalaVer = Seq(scalaVer, "2.10.6", "2.12.0")
 
 lazy val commonSettings = Seq(
   name         := "scala-java-time",
-  version      := "2.0.0-M4",
+  version      := "2.0.0-M5",
   organization := "io.github.soc",
   homepage     := Some(url("https://github.com/soc/scala-java-time")),
   licenses     := Seq("BSD 3-Clause License" -> url("https://opensource.org/licenses/BSD-3-Clause")),
diff --git a/changes.xml b/changes.xml
@@ -8,6 +8,11 @@
   </properties>
   <body>
     <!-- types are add, fix, remove, update -->
+    <release version="2.0.0-M5" date="2016-11-08" description="v2.0.0-M5">
+      <action dev="cquiroz" type="fix" >
+        Fix #47: Test failures on TestDateTimeFormatters on Scala 2.12
+      </action>
+    </release>
     <release version="2.0.0-M4" date="2016-11-06" description="v2.0.0-M4">
       <action dev="cquiroz" type="update" >
         Update locales version using CLDR 30
diff --git a/jvm/src/test/scala/org/threeten/bp/format/TestDateTimeFormatters.scala b/jvm/src/test/scala/org/threeten/bp/format/TestDateTimeFormatters.scala
@@ -111,12 +111,13 @@ object TestDateTimeFormatters {
 
     def isSupported(field: TemporalField): Boolean = fields.containsKey(field)
 
-    def getLong(field: TemporalField): Long =
-      try fields.get(field)
-      catch {
-        case ex: NullPointerException =>
-          throw new DateTimeException("Field missing: " + field)
-      }
+    def getLong(field: TemporalField): Long = {
+      val long: java.lang.Long = fields.get(field)
+      if (long == null)
+        throw new DateTimeException(s"Field missing: $field")
+      else
+        long
+    }
 
     @SuppressWarnings(Array("unchecked")) override def query[R >: Null](query: TemporalQuery[R]): R =
       if (query eq TemporalQueries.zoneId)
