raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Resolving conflict

Browse source
This commit is contained in:
Viktor Klang 2011-03-18 20:47:37 +01:00
commit 89ecb74147
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
akka-actor/src/main/scala/akka/actor/Actor.scala
View file

@ -111,10 +111,10 @@ object EventHandler extends ListenerManagement {
import java.util.Date
import akka.dispatch.Dispatchers
val ErrorLevel = 1
val ErrorLevel = 1
val WarningLevel = 2
val InfoLevel = 3
val DebugLevel = 4
val InfoLevel = 3
val DebugLevel = 4
sealed trait Event {
@transient val thread: Thread = Thread.currentThread
@ -145,7 +145,7 @@ object EventHandler extends ListenerManagement {
def notify(event: => AnyRef) = notifyListeners(event)
def notify[T <: Event : ClassManifest](event: => T) {
if (classManifest[T].erasure.asInstanceOf[Class[_ <: Event]] == level) notifyListeners(event) //WTF?
if (level >= levelFor(classManifest[T].erasure.asInstanceOf[Class[_ <: Event]])) notifyListeners(event)
}
def error(cause: Throwable, instance: AnyRef, message: => String) = {
@ -173,6 +173,14 @@ object EventHandler extends ListenerManagement {
sw.toString
}
private def levelFor(eventClass: Class[_ <: Event]) = {
if (eventClass.isInstanceOf[Error]) ErrorLevel
else if (eventClass.isInstanceOf[Warning]) WarningLevel
else if (eventClass.isInstanceOf[Info]) InfoLevel
else if (eventClass.isInstanceOf[Debug]) DebugLevel
else DebugLevel
}
class DefaultListener extends Actor {
self.id = ID
self.dispatcher = EventHandlerDispatcher