From bfe82b2f3dd65c8e8679e67fce4959a1c0a4c009 Mon Sep 17 00:00:00 2001 From: Jay McCarthy Date: Mon, 7 Sep 2009 19:56:45 +0000 Subject: [PATCH] Changing from exn? to exn:fail? svn: r15902 --- collects/web-server/configuration/configuration-table.ss | 2 +- collects/web-server/configuration/namespace.ss | 4 ++-- collects/web-server/dispatch/coercion.ss | 2 +- collects/web-server/dispatchers/dispatch-log.ss | 4 ++-- collects/web-server/dispatchers/filesystem-map.ss | 2 +- collects/web-server/http/digest-auth.ss | 2 +- collects/web-server/http/request.ss | 2 +- collects/web-server/http/response.ss | 4 ++-- collects/web-server/lang/file-box.ss | 2 +- collects/web-server/private/connection-manager.ss | 2 +- collects/web-server/private/url-param.ss | 4 ++-- collects/web-server/scribblings/tutorial/examples/dummy-3.ss | 2 +- collects/web-server/scribblings/tutorial/examples/model-2.ss | 2 +- collects/web-server/scribblings/tutorial/examples/model-3.ss | 2 +- collects/web-server/servlet/web.ss | 2 +- 15 files changed, 19 insertions(+), 19 deletions(-) diff --git a/collects/web-server/configuration/configuration-table.ss b/collects/web-server/configuration/configuration-table.ss index 83727fb215..69b897e24c 100644 --- a/collects/web-server/configuration/configuration-table.ss +++ b/collects/web-server/configuration/configuration-table.ss @@ -21,7 +21,7 @@ (first (get-binding* key bindings (list default)))) (define (get-binding* key bindings default) - (with-handlers ([exn? (lambda _ default)]) + (with-handlers ([exn:fail? (lambda _ default)]) (extract-binding/single key bindings))) (define (read-configuration-table table-file-name) diff --git a/collects/web-server/configuration/namespace.ss b/collects/web-server/configuration/namespace.ss index fad29677b2..212ee93b24 100644 --- a/collects/web-server/configuration/namespace.ss +++ b/collects/web-server/configuration/namespace.ss @@ -15,7 +15,7 @@ (define (get-name spec) (if (symbol? spec) spec - (with-handlers ([exn? (lambda _ #f)]) + (with-handlers ([exn:fail? (lambda _ #f)]) ((current-module-name-resolver) spec #f #f)))) (define to-be-copied-module-names (map get-name @@ -28,7 +28,7 @@ (parameterize ([current-namespace new-namespace]) (namespace-require scheme/base-module-spec) (for-each (lambda (name) - (with-handlers ([exn? void]) + (with-handlers ([exn:fail? void]) (when name (namespace-attach-module server-namespace name)))) (append to-be-copied-module-names diff --git a/collects/web-server/dispatch/coercion.ss b/collects/web-server/dispatch/coercion.ss index da9ae68130..c700f64b5f 100644 --- a/collects/web-server/dispatch/coercion.ss +++ b/collects/web-server/dispatch/coercion.ss @@ -2,7 +2,7 @@ (define (make-coerce-safe? coerce) (lambda (x) - (with-handlers ([exn? (lambda (x) #f)]) + (with-handlers ([exn:fail? (lambda (x) #f)]) (and (coerce x) #t)))) (define-syntax (define-coercion-match-expander stx) diff --git a/collects/web-server/dispatchers/dispatch-log.ss b/collects/web-server/dispatchers/dispatch-log.ss index 6bfdb4b919..955bee2ee8 100644 --- a/collects/web-server/dispatchers/dispatch-log.ss +++ b/collects/web-server/dispatchers/dispatch-log.ss @@ -83,9 +83,9 @@ (match-lambda [(list req) (loop - (with-handlers ([exn? (lambda (e) + (with-handlers ([exn:fail? (lambda (e) ((error-display-handler) "dispatch-log.ss: Error writing log entry" e) - (with-handlers ([exn? (lambda (e) #f)]) + (with-handlers ([exn:fail? (lambda (e) #f)]) (close-output-port log-p)) #f)]) (define the-log-p diff --git a/collects/web-server/dispatchers/filesystem-map.ss b/collects/web-server/dispatchers/filesystem-map.ss index 7db88bcab2..7b57c7a674 100644 --- a/collects/web-server/dispatchers/filesystem-map.ss +++ b/collects/web-server/dispatchers/filesystem-map.ss @@ -41,7 +41,7 @@ (define ((make-url->valid-path url->path) u) (let loop ([up (url-path u)]) #;(printf "~S~n" `(url->valid-path ,(url->string u) ,up)) - (with-handlers ([exn? (lambda (exn) + (with-handlers ([exn:fail? (lambda (exn) #;((error-display-handler) (exn-message exn) exn) (if (empty? up) (raise exn) diff --git a/collects/web-server/http/digest-auth.ss b/collects/web-server/http/digest-auth.ss index 0d2a4ee5d3..075dce16f7 100644 --- a/collects/web-server/http/digest-auth.ss +++ b/collects/web-server/http/digest-auth.ss @@ -130,7 +130,7 @@ (error (lambda (a b c) (error 'digest-parser "Malformed digest: ~v ~v ~v" a b c))))) (define (do-digest-parse str) - (with-handlers ([exn? (lambda _ #f)]) + (with-handlers ([exn:fail? (lambda _ #f)]) (with-input-from-string str (lambda () diff --git a/collects/web-server/http/request.ss b/collects/web-server/http/request.ss index ffe274b741..5200bee725 100644 --- a/collects/web-server/http/request.ss +++ b/collects/web-server/http/request.ss @@ -16,7 +16,7 @@ (values request? boolean?))]) (define (ext:read-request conn host-port port-addresses) - (with-handlers ([exn? (lambda (exn) + (with-handlers ([exn:fail? (lambda (exn) (kill-connection! conn) (raise exn))]) (read-request conn host-port port-addresses))) diff --git a/collects/web-server/http/response.ss b/collects/web-server/http/response.ss index 67de979f97..5eaa83b65b 100644 --- a/collects/web-server/http/response.ss +++ b/collects/web-server/http/response.ss @@ -149,7 +149,7 @@ (define (ext:wrap f) (lambda (conn . args) - (with-handlers ([exn? (lambda (exn) + (with-handlers ([exn:fail? (lambda (exn) (kill-connection! conn) (raise exn))]) (apply f conn args) @@ -262,7 +262,7 @@ (apply + (map (lambda (range) (- (cdr range) (car range))) converted-ranges))) - (with-handlers ([exn? (lambda (exn) (network-error 'output-file (exn-message exn)))]) + (with-handlers ([exn:fail? (lambda (exn) (network-error 'output-file (exn-message exn)))]) (call-with-input-file file-path (lambda (input) (if (= (length converted-ranges) 1) diff --git a/collects/web-server/lang/file-box.ss b/collects/web-server/lang/file-box.ss index 6ec9c4841b..f7e8df66a2 100644 --- a/collects/web-server/lang/file-box.ss +++ b/collects/web-server/lang/file-box.ss @@ -12,7 +12,7 @@ fb) (define (file-box-set? fb) - (with-handlers ([exn? (lambda _ #f)]) + (with-handlers ([exn:fail? (lambda _ #f)]) (file-unbox fb) #t)) diff --git a/collects/web-server/private/connection-manager.ss b/collects/web-server/private/connection-manager.ss index 25dde16ada..95c127a4ac 100644 --- a/collects/web-server/private/connection-manager.ss +++ b/collects/web-server/private/connection-manager.ss @@ -45,7 +45,7 @@ ;; kill this connection (define (kill-connection! conn) #;(printf "K: ~a~n" (connection-id conn)) - (with-handlers ([exn? void]) + (with-handlers ([exn:fail? void]) (cancel-timer! (connection-timer conn))) (kill-connection-w/o-timer! conn)) diff --git a/collects/web-server/private/url-param.ss b/collects/web-server/private/url-param.ss index a25ca7c6b4..172158502c 100644 --- a/collects/web-server/private/url-param.ss +++ b/collects/web-server/private/url-param.ss @@ -15,7 +15,7 @@ (map path/param-param (url-path url)))) (let/ec esc (for-each (lambda (p) - (with-handlers ([exn? void]) + (with-handlers ([exn:fail? void]) (define l (read/string p)) (esc (cdr (assoc key l))))) ps) @@ -38,7 +38,7 @@ (path/param-path f) (list (write/string (list* (cons key val) - (with-handlers ([exn? (lambda _ empty)]) + (with-handlers ([exn:fail? (lambda _ empty)]) (filter (lambda (k*v) (not (equal? key (car k*v)))) (read/string (first (path/param-param f))))))))) r))])]) diff --git a/collects/web-server/scribblings/tutorial/examples/dummy-3.ss b/collects/web-server/scribblings/tutorial/examples/dummy-3.ss index 1b29cb10e1..574923e9a5 100644 --- a/collects/web-server/scribblings/tutorial/examples/dummy-3.ss +++ b/collects/web-server/scribblings/tutorial/examples/dummy-3.ss @@ -14,7 +14,7 @@ (define (initialize-blog! home) (define db (sqlite:open home)) (define the-blog (make-blog db)) - (with-handlers ([exn? void]) + (with-handlers ([exn:fail? void]) (sqlite:exec/ignore db (string-append "CREATE TABLE posts " diff --git a/collects/web-server/scribblings/tutorial/examples/model-2.ss b/collects/web-server/scribblings/tutorial/examples/model-2.ss index 7b03a855e2..ee8c713a6f 100644 --- a/collects/web-server/scribblings/tutorial/examples/model-2.ss +++ b/collects/web-server/scribblings/tutorial/examples/model-2.ss @@ -22,7 +22,7 @@ "This is another post" (list))))) (define the-blog - (with-handlers ([exn? log-missing-exn-handler]) + (with-handlers ([exn:fail? log-missing-exn-handler]) (with-input-from-file home read)))] (set-blog-home! the-blog (path->string home)) the-blog)) diff --git a/collects/web-server/scribblings/tutorial/examples/model-3.ss b/collects/web-server/scribblings/tutorial/examples/model-3.ss index 3e6a28ce56..4dc3a40331 100644 --- a/collects/web-server/scribblings/tutorial/examples/model-3.ss +++ b/collects/web-server/scribblings/tutorial/examples/model-3.ss @@ -14,7 +14,7 @@ (define (initialize-blog! home) (define db (sqlite:open home)) (define the-blog (make-blog db)) - (with-handlers ([exn? void]) + (with-handlers ([exn:fail? void]) (sqlite:exec/ignore db (string-append "CREATE TABLE posts " diff --git a/collects/web-server/servlet/web.ss b/collects/web-server/servlet/web.ss index 06b0cb0bb1..7a2f20fd1e 100644 --- a/collects/web-server/servlet/web.ss +++ b/collects/web-server/servlet/web.ss @@ -148,7 +148,7 @@ (define (with-errors-to-browser send/finish-or-back thunk) - (with-handlers ([exn? (lambda (exn) + (with-handlers ([exn:fail? (lambda (exn) (send/finish-or-back `(html (head (title "Servlet Error")) (body ([bgcolor "white"])