Skip to content

Commit ee5540f

Browse files
committed
Fix hang. Do not queue error event to self.
1 parent 5e8cc6e commit ee5540f

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

generic/threadCmd.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1978,13 +1978,14 @@ ThreadErrorProc(
19781978
const char *argv[3];
19791979
char buf[THREAD_HNDLMAXLEN];
19801980
const char *errorInfo;
1981+
Tcl_ThreadId myId = Tcl_GetCurrentThread();
19811982

19821983
errorInfo = Tcl_GetVar2(interp, "errorInfo", NULL, TCL_GLOBAL_ONLY);
19831984
if (errorInfo == NULL) {
19841985
errorInfo = "";
19851986
}
19861987

1987-
if (errorProcString == NULL) {
1988+
if (errorProcString == NULL || errorThreadId == myId) {
19881989
#ifdef NS_AOLSERVER
19891990
Ns_Log(Error, "%s\n%s", Tcl_GetString(Tcl_GetObjResult(interp)), errorInfo);
19901991
#else

0 commit comments

Comments
 (0)