--- a/src/JavaVM.st	Wed Nov 09 16:17:19 2011 +0000
+++ b/src/JavaVM.st	Wed Nov 09 16:39:15 2011 +0000
@@ -15693,18 +15693,14 @@
             objString := someObject class name , '@' 
                         , someObject identityHash printString.
         ].
-        Logger 
-            log: 'entering monitor for ' , objString , ' in ' , thisProcess name
-            severity: #info
-            facility: #JVM.
+        Logger log: 'entering monitor for ' , objString , ' in ' , thisProcess name 
+                        severity:#info facility:#JVM.
     ].
     mon enter.
     aJavaContext addMonitor: someObject.
     MonitorTrace ifTrue: [
-        Logger 
-            log: 'monitor entered in ' , thisProcess name
-            severity: #info
-            facility: #JVM.
+        Logger log: 'monitor entered in ' , thisProcess name 
+                        severity:#info facility:#JVM.
     ].
     (self enteredMonitorsOfProcess: thisProcess) add: someObject.
 
@@ -15731,7 +15727,9 @@
             log: 'leaving monitor for ' , objString , ' in ' , thisProcess name
             severity: #info
             facility: #JVM.
-    ].    
+    ].
+    mon exit.
+    aJavaContext removeMonitor: someObject.
     MonitorTrace ifTrue: [
         Logger 
             log: 'monitor left in ' , thisProcess name
@@ -15742,8 +15740,6 @@
     lastMon ~~ someObject ifTrue: [
         self halt: 'oops - monitor enter/exit nesting wrong'
     ].
-    mon exit.
-        aJavaContext removeMonitor: someObject.
     wasBlocked := OperatingSystem blockInterrupts.
      "mon count == 0 ifTrue: [ LeftMonitorObject := someObject ]."
     wasBlocked ifFalse: [ OperatingSystem unblockInterrupts ]
@@ -15950,7 +15946,7 @@
     
     enteredMonitors size > 0 ifTrue: [
         wasBlocked := OperatingSystem blockInterrupts.
-         "self syncMonitorCache."
+        "self syncMonitorCache."
         MonitorTrace ifTrue: [
             ('====> wait - reenter ' , enteredMonitors size printString 
                 , ' monitors in ' , Processor activeProcess name 
@@ -15977,7 +15973,7 @@
 
     "Created: / 30-12-1998 / 19:19:35 / cg"
     "Modified: / 08-01-1999 / 17:29:24 / cg"
-    "Modified: / 09-11-2011 / 16:23:16 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 09-11-2011 / 14:36:18 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
 !JavaVM class methodsFor:'vm support'!
@@ -16020,15 +16016,18 @@
     "Modified: / 31-05-2011 / 10:09:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
-_ATHROW: aJavaException 
+_ATHROW:aJavaException
+
     <resource: #skipInDebuggersWalkBack>
-    aJavaException isNil ifTrue: [ self halt: 'cannot happen' ].
-    self breakPoint:#mh.
-    self throwException: aJavaException.
+
+    aJavaException isNil ifTrue:[
+        self halt:'cannot happen'
+    ].
+    self throwException:aJavaException
 
     "Created: / 08-01-1999 / 14:15:36 / cg"
-    "Modified: / 04-03-2011 / 00:07:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 09-11-2011 / 16:36:44 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 08-11-2011 / 16:32:54 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 08-11-2011 / 22:16:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 _CHECKCAST2: object _: aJavaClassRef