From e42b1f888d02d9bff5c918061710d6d75a00d207 Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Thu, 15 Apr 2010 16:05:16 +0200 Subject: [PATCH 1/4] Removed Scala 2.8 deprecation warnings --- .../src/test/scala/MongoStorageSpec.scala | 2 +- .../src/test/scala/SupervisionBeanDefinitionParserTest.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/akka-persistence/akka-persistence-mongo/src/test/scala/MongoStorageSpec.scala b/akka-persistence/akka-persistence-mongo/src/test/scala/MongoStorageSpec.scala index 186157b576..97307dde17 100644 --- a/akka-persistence/akka-persistence-mongo/src/test/scala/MongoStorageSpec.scala +++ b/akka-persistence/akka-persistence-mongo/src/test/scala/MongoStorageSpec.scala @@ -192,7 +192,7 @@ class MongoStorageSpec extends TestCase { assertTrue(l.map(_._1).contains("3")) assertTrue(l.map(_._1).contains("4")) - val JsString(str) = l.filter(_._1 == "2").first._2 + val JsString(str) = l.filter(_._1 == "2").head._2 assertEquals(str, "peter") // trying to fetch for a non-existent transaction will throw diff --git a/akka-spring/src/test/scala/SupervisionBeanDefinitionParserTest.scala b/akka-spring/src/test/scala/SupervisionBeanDefinitionParserTest.scala index af79ecf5df..e0344ae4fb 100644 --- a/akka-spring/src/test/scala/SupervisionBeanDefinitionParserTest.scala +++ b/akka-spring/src/test/scala/SupervisionBeanDefinitionParserTest.scala @@ -50,7 +50,7 @@ class SupervisionBeanDefinitionParserTest extends Spec with ShouldMatchers { val supervised = builder.getBeanDefinition.getPropertyValues.getPropertyValue("supervised").getValue.asInstanceOf[List[ActiveObjectProperties]] assert(supervised != null) expect(3) { supervised.length } - val iterator = supervised.elements + val iterator = supervised.iterator expect("foo.bar.Foo") { iterator.next.target } expect("foo.bar.Bar") { iterator.next.target } expect("foo.bar.MyPojo") { iterator.next.target } From ca88bf237ec6074beef307bd6eea73589498f1d1 Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Mon, 19 Apr 2010 23:49:39 +0200 Subject: [PATCH 2/4] Removed jndi.properties --- akka-kernel/src/main/resources/jndi.properties | 1 - 1 file changed, 1 deletion(-) delete mode 100644 akka-kernel/src/main/resources/jndi.properties diff --git a/akka-kernel/src/main/resources/jndi.properties b/akka-kernel/src/main/resources/jndi.properties deleted file mode 100644 index 3485823a1e..0000000000 --- a/akka-kernel/src/main/resources/jndi.properties +++ /dev/null @@ -1 +0,0 @@ -java.naming.factory.initial=com.sun.enterprise.naming.SerialInitContextFactory \ No newline at end of file From ca83d0af644fcacac018aa29cb47468bf2898629 Mon Sep 17 00:00:00 2001 From: Peter Vlugter Date: Tue, 20 Apr 2010 11:07:16 +1200 Subject: [PATCH 3/4] added Dean's test for Vector bug (blowing up after 32 items) --- .../src/test/scala/VectorBugTestSuite.scala | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 akka-core/src/test/scala/VectorBugTestSuite.scala diff --git a/akka-core/src/test/scala/VectorBugTestSuite.scala b/akka-core/src/test/scala/VectorBugTestSuite.scala new file mode 100644 index 0000000000..658ace3681 --- /dev/null +++ b/akka-core/src/test/scala/VectorBugTestSuite.scala @@ -0,0 +1,17 @@ +package se.scalablesolutions.akka.stm + +import org.scalatest.FunSuite +import Transaction.Global._ + +class TransactionalVectorBugTestSuite extends FunSuite { + + test("adding more than 32 items to a Vector shouldn't blow it up") { + atomic { + var v1 = new Vector[Int]() + for (i <- 0 to 31) { + v1 = v1 + i + } + v1 = v1 + 32 + } + } +} From 7f9a9c7130b2847f2901c57c99b9d93ebb820abe Mon Sep 17 00:00:00 2001 From: Peter Vlugter Date: Tue, 20 Apr 2010 11:07:59 +1200 Subject: [PATCH 4/4] fix for Vector from Dean (ticket #155) --- akka-core/src/main/scala/stm/Vector.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/akka-core/src/main/scala/stm/Vector.scala b/akka-core/src/main/scala/stm/Vector.scala index b76281b909..a526906115 100644 --- a/akka-core/src/main/scala/stm/Vector.scala +++ b/akka-core/src/main/scala/stm/Vector.scala @@ -326,7 +326,7 @@ object Vector { @inline private[stm] def array(elems: AnyRef*) = { val back = new Array[AnyRef](elems.length) - Array.copy(elems, 0, back, 0, back.length) + Array.copy(elems.toArray, 0, back, 0, back.length) back }