--- a/Notification.st	Tue May 10 15:04:58 2016 +0200
+++ b/Notification.st	Tue May 10 15:06:22 2016 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1999 by eXept Software AG
               All Rights Reserved
@@ -160,7 +162,7 @@
 
     "Calling raiseRequest here will execute the exception's action method"    
 
-    ^ super raiseRequest
+    ^ nil "/ super raiseRequest
 
     "Created: / 23.7.1999 / 15:16:03 / stefan"
 !
@@ -228,49 +230,7 @@
      Invoking the handler is exactly the functionality of Signal>>raiseRequest,
      but we can do it faster here (avoiding the construction of an exception instance)."
 
-    |con signal ret|
-
-    con := Context findFirstSpecialHandle:true raise:false.
-    [con notNil] whileTrue:[
-        (con selector == #answer:do:) ifTrue:[ 
-            signal := con receiver.
-            signal == self ifTrue:[
-                ret := con argAt:1.
-                con := nil.
-                ^ ret
-            ].
-            signal isNil ifTrue:[
-                self error:'nil receiver in #answer:do: - send'.
-            ].
-            (signal accepts:self) ifTrue:[
-                ret := con argAt:1.
-                con := nil.
-                ^ ret
-            ].
-        ] ifFalse:[
-            "ask the the receiver of the #handle:do: or #on:do: or whatever- message for the handler.
-             nil is returned, if the signal is not accepted"
-            |r|
-            r := con receiver.     "receiver of #handle:do: or #on:do:"
-            (r notNil and:[(r handlerForSignal:self
-                                 context:con
-                                 originator:thisContext sender homeReceiver) notNil]
-            ) ifTrue:[
-                "there is another handler block, maybe it will return the answer.
-                 Call it via raiseRequest"
-                con := nil.
-                ^ super raiseRequest
-            ].
-        ].
-        con := con findSpecialHandle:true raise:false.
-    ].
-
-    "/ no handler found - return the default value
-    ^ self defaultAnswer
-
-    "Modified: / 15-06-1998 / 21:27:37 / cg"
-    "Modified: / 25-07-1999 / 23:15:16 / stefan"
-    "Modified: / 11-03-2015 / 11:26:45 / sr"
+    ^ self raiseAsQuery
 !
 
 raise
@@ -285,7 +245,7 @@
 raiseRequest
     "redefined to use #query"
 
-    ^ self query
+    ^ self raiseAsQuery
 
     "Created: / 25.7.1999 / 23:25:59 / stefan"
 ! !