PR 8349 and 8364
svn: r4806
This commit is contained in:
parent
6b80bd355c
commit
9799cc53b0
|
@ -113,9 +113,11 @@
|
||||||
servlet-mutex))
|
servlet-mutex))
|
||||||
(define the-exit-handler
|
(define the-exit-handler
|
||||||
(lambda _
|
(lambda _
|
||||||
(kill-connection!
|
(define ectxt
|
||||||
(execution-context-connection
|
(thread-cell-ref current-execution-context))
|
||||||
(thread-cell-ref current-execution-context)))
|
(when ectxt
|
||||||
|
(kill-connection!
|
||||||
|
(execution-context-connection ectxt)))
|
||||||
(custodian-shutdown-all instance-custodian)))
|
(custodian-shutdown-all instance-custodian)))
|
||||||
(thread-cell-set! current-execution-context ctxt)
|
(thread-cell-set! current-execution-context ctxt)
|
||||||
(parameterize ([exit-handler the-exit-handler])
|
(parameterize ([exit-handler the-exit-handler])
|
||||||
|
@ -224,14 +226,15 @@
|
||||||
(semaphore-wait (servlet-instance-data-mutex data))
|
(semaphore-wait (servlet-instance-data-mutex data))
|
||||||
(let ([response
|
(let ([response
|
||||||
(let/cc suspend
|
(let/cc suspend
|
||||||
(define k ((manager-continuation-lookup manager) instance-id k-id salt))
|
|
||||||
(thread-cell-set! current-execution-context
|
(thread-cell-set! current-execution-context
|
||||||
(make-execution-context
|
(make-execution-context
|
||||||
conn req suspend))
|
conn req suspend))
|
||||||
(k req))])
|
(let ([k ((manager-continuation-lookup manager) instance-id k-id salt)])
|
||||||
|
(k req)))])
|
||||||
(output-response conn response))
|
(output-response conn response))
|
||||||
(semaphore-post (servlet-instance-data-mutex data))))
|
(semaphore-post (servlet-instance-data-mutex data))))
|
||||||
((manager-instance-unlock! manager) instance-id)
|
((manager-instance-unlock! manager) instance-id)
|
||||||
|
(thread-cell-set! current-execution-context #f)
|
||||||
(thread-cell-set! current-servlet-instance-id #f)
|
(thread-cell-set! current-servlet-instance-id #f)
|
||||||
(thread-cell-set! current-servlet #f))
|
(thread-cell-set! current-servlet #f))
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user