Permalink
Browse files

Fixed issue with AbstractHandler reify in Jetty adapter

  • Loading branch information...
1 parent 7b8f6bc commit 6ad60d81be725da9e841b93bcd3da7951b7ce925 @weavejester weavejester committed Sep 10, 2010
Showing with 10 additions and 12 deletions.
  1. +10 −12 ring-jetty-adapter/src/ring/adapter/jetty.clj
View
22 ring-jetty-adapter/src/ring/adapter/jetty.clj
@@ -5,19 +5,18 @@
(org.mortbay.jetty.bio SocketConnector)
(org.mortbay.jetty.security SslSocketConnector)
(javax.servlet.http HttpServletRequest HttpServletResponse))
- (:use (ring.util servlet)
- (clojure.contrib except)))
+ (:use ring.util.servlet))
-(defn- reify-handler
+(defn- proxy-handler
"Returns an Jetty Handler implementation for the given Ring handler."
[handler]
- (reify AbstractHandler
- (handle [this target ^Request request response dispatch]
- (let [request-map (build-request-map request)
- response-map (handler request-map)]
- (when response-map
- (update-servlet-response response response-map)
- (.setHandled request true))))))
+ (proxy [AbstractHandler] []
+ (handle [target ^Request request response dispatch]
+ (let [request-map (build-request-map request)
+ response-map (handler request-map)]
+ (when response-map
+ (update-servlet-response response response-map)
+ (.setHandled request true))))))
(defn- add-ssl-connector!
"Add an SslSocketConnector to a Jetty Server instance."
@@ -64,9 +63,8 @@
(when-let [configurator (:configurator options)]
(configurator s))
(doto s
- (.setHandler (reify-handler handler))
+ (.setHandler (proxy-handler handler))
(.start))
(when (:join? options true)
(.join s))
s))
-

0 comments on commit 6ad60d8

Please sign in to comment.