From 182885bd71e4e53d7e022167e49216756edfe175 Mon Sep 17 00:00:00 2001 From: Michael Kober Date: Mon, 13 Sep 2010 14:04:22 +0200 Subject: [PATCH] merged with master --- akka-actor/src/main/scala/util/ReflectiveAccess.scala | 3 --- akka-spring/src/main/scala/ActorParser.scala | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/akka-actor/src/main/scala/util/ReflectiveAccess.scala b/akka-actor/src/main/scala/util/ReflectiveAccess.scala index 8bfb7f857e..abccd5d9b0 100644 --- a/akka-actor/src/main/scala/util/ReflectiveAccess.scala +++ b/akka-actor/src/main/scala/util/ReflectiveAccess.scala @@ -29,9 +29,6 @@ object ReflectiveAccess { def ensureTypedActorEnabled = TypedActorModule.ensureTypedActorEnabled def ensureJtaEnabled = JtaModule.ensureJtaEnabled - private val noParams = Array[Class[_]]() - private val noArgs = Array[AnyRef]() - /** * Reflective access to the RemoteClient module. * diff --git a/akka-spring/src/main/scala/ActorParser.scala b/akka-spring/src/main/scala/ActorParser.scala index 8736b807d1..9858e9ad7e 100644 --- a/akka-spring/src/main/scala/ActorParser.scala +++ b/akka-spring/src/main/scala/ActorParser.scala @@ -184,8 +184,7 @@ trait DispatcherParser extends BeanParser { val threadPoolElement = DomUtils.getChildElementByTagName(dispatcherElement, THREAD_POOL_TAG); if (threadPoolElement != null) { - if (properties.dispatcherType == REACTOR_BASED_SINGLE_THREAD_EVENT_DRIVEN || - properties.dispatcherType == THREAD_BASED) { + if (properties.dispatcherType == THREAD_BASED) { throw new IllegalArgumentException("Element 'thread-pool' not allowed for this dispatcher type.") } val threadPoolProperties = parseThreadPool(threadPoolElement)