Index: openacs-4/packages/acs-tcl/tcl/exception-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/exception-procs.tcl,v diff -u -r1.3.10.1 -r1.3.10.2 --- openacs-4/packages/acs-tcl/tcl/exception-procs.tcl 29 Sep 2013 19:23:18 -0000 1.3.10.1 +++ openacs-4/packages/acs-tcl/tcl/exception-procs.tcl 2 Oct 2013 22:55:55 -0000 1.3.10.2 @@ -29,12 +29,13 @@ @see with_finally @see with_catch } { - global errorInfo errorCode if {[set errno [catch {uplevel $code} result]]} { - if {$errno == 1 && [string equal [lindex $errorCode 0] "AD"] && \ - [string equal [lindex $errorCode 1] "EXCEPTION"]} { - set exception [lindex $errorCode 2] + if {$errno == 1 + && [lindex $::errorCode 0] eq "AD" + && [lindex $::errorCode 1] eq "EXCEPTION" + } { + set exception [lindex $::errorCode 2] set matched 0 for {set i 0} {$i < [llength $args]} {incr i 3} { @@ -51,6 +52,6 @@ } } - return -code $errno -errorcode $errorCode -errorinfo $errorInfo $result + return -code $errno -errorcode $::errorCode -errorinfo $::errorInfo $result } }