Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ring-jetty-adapter/src/ring/adapter/jetty.clj
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
[org.eclipse.jetty.util BlockingArrayQueue]
[org.eclipse.jetty.util.thread ThreadPool QueuedThreadPool]
[org.eclipse.jetty.util.ssl SslContextFactory$Server KeyStoreScanner]
[org.eclipse.jetty.ee9.nested Request]
[org.eclipse.jetty.ee9.nested Request Response]
[org.eclipse.jetty.ee9.websocket.server
JettyServerUpgradeRequest
JettyServerUpgradeResponse
Expand Down Expand Up @@ -110,7 +110,7 @@

(defn- proxy-handler ^ServletHandler [handler options]
(proxy [ServletHandler] []
(doHandle [_ ^Request base-request request response]
(doHandle [_ ^Request base-request request ^Response response]
(let [request-map (servlet/build-request-map request)
response-map (handler request-map)]
(try
Expand Down Expand Up @@ -209,7 +209,7 @@
(defn- ssl-context-factory ^SslContextFactory$Server [options]
(let [context-server (SslContextFactory$Server.)]
(if (string? (options :keystore))
(.setKeyStorePath context-server (options :keystore))
(.setKeyStorePath context-server ^String (options :keystore))
(.setKeyStore context-server ^java.security.KeyStore (options :keystore)))
(when (string? (options :keystore-type))
(.setKeyStoreType context-server (options :keystore-type)))
Expand Down
Loading