Fixes with new lib versions

dchenbecker · Nov 3, 2016 · e4ff62f · e4ff62f
1 parent 595459c
commit e4ff62f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/README.markdown b/README.markdown
@@ -13,7 +13,7 @@ and that you license the work to the ScalaJPA project under the project's
 
 # License
 
-Copyright &copy; 2008-2010 Derek Chen-Becker 
+Copyright &copy; 2008-2016 Derek Chen-Becker 
 
 Licensed under the Apache License, Version 2.0 (the "License"); 
 you may not use this file except in compliance with the License.
@@ -25,4 +25,4 @@ Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions
-and limitations under the License. 
+and limitations under the License. 
diff --git a/src/main/scala/org/scala_libs/jpa/JndiEM.scala b/src/main/scala/org/scala_libs/jpa/JndiEM.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2009 Derek Chen-Becker
+ * Copyright 2008-2016 Derek Chen-Becker
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -82,13 +82,10 @@ class JndiEMF(val jndiName : String) extends ScalaEMFactory {
   def closeEM (em : EntityManager) = {
     /* We only want to commit if we haven't already thrown an exception (due to a constraint violation, etc)
      */
-    try {
-      if (tx.getStatus() == Status.STATUS_MARKED_ROLLBACK) {
-	tx.rollback()
-      } else if (tx.getStatus() == Status.STATUS_ACTIVE) {
-	tx.commit()
-      } else {
-      }
+    if (tx.getStatus() == Status.STATUS_MARKED_ROLLBACK) {
+      tx.rollback()
+    } else if (tx.getStatus() == Status.STATUS_ACTIVE) {
+      tx.commit()
     }
   }
 

diff --git a/src/test/scala/org/scala_libs/jpa/test/ScalaJPASpecs.scala b/src/test/scala/org/scala_libs/jpa/test/ScalaJPASpecs.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2011 Derek Chen-Becker
+ * Copyright 2008-2016 Derek Chen-Becker
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,8 +25,9 @@ import org.specs2.mutable.Specification
 object ThreadEM extends LocalEMF("test") with ThreadLocalEM
 
 class ScalaJPASpecs extends Specification {
+  sequential
+
   "The 'test' LocalEMF instance" should {
-    sequential
     val myInstance = new MyItem
     myInstance.id = 42
     myInstance.name = "Fred"