Fixing PR 7359

svn: r657
This commit is contained in:
Jay McCarthy 2005-08-24 18:02:23 +00:00
parent 68667a740f
commit d981654bbc

View File

@ -651,6 +651,7 @@
;;;;;; (two versions, 'v1 and I don't know what 'typed-model-split-store0 is) ;;;;;; (two versions, 'v1 and I don't know what 'typed-model-split-store0 is)
;;;; A response ;;;; A response
(define (load-servlet/path a-path) (define (load-servlet/path a-path)
(parameterize ([current-namespace (config:make-servlet-namespace)])
(and (file-exists? a-path) (and (file-exists? a-path)
(let ([s (load/use-compiled a-path)]) (let ([s (load/use-compiled a-path)])
(cond (cond
@ -661,7 +662,6 @@
; FIX - reason about exceptions from dynamic require (catch and report if not already) ; FIX - reason about exceptions from dynamic require (catch and report if not already)
;; module servlet ;; module servlet
[(void? s) [(void? s)
(parameterize ([current-namespace (config:make-servlet-namespace)])
(let* ([module-name `(file ,(path->string a-path))] (let* ([module-name `(file ,(path->string a-path))]
[version (dynamic-require module-name 'interface-version)]) [version (dynamic-require module-name 'interface-version)])
(case version (case version
@ -681,7 +681,7 @@
(make-cache-entry the-servlet (make-cache-entry the-servlet
(current-namespace)))] (current-namespace)))]
[else [else
(raise (format "unknown servlet version ~e" version))])))] (raise (format "unknown servlet version ~e" version))]))]
;; response ;; response
[(response? s) [(response? s)
(letrec ([go (lambda () (letrec ([go (lambda ()
@ -691,5 +691,5 @@
(make-cache-entry (unit/sig () (import servlet^) (go)) (make-cache-entry (unit/sig () (import servlet^) (go))
(current-namespace)))] (current-namespace)))]
[else [else
(raise (format "Loading ~e produced ~n~e~n instead of a servlet." a-path s))])))) (raise (format "Loading ~e produced ~n~e~n instead of a servlet." a-path s))])))))
))) )))