Support for KeyStore instances in Jetty adapter

mmcgrana · 8978cbf4845b3e0dbd3a7e4415da44518f4f43d5 · weavejester committed Mar 1, 2012 · Mar 1, 2012 · 8978cbf
1 parent 36f7507
commit 8978cbf4845b3e0dbd3a7e4415da44518f4f43d5
Unified Split

Showing with 3 additions and 1 deletion.

+3 −1 ring-jetty-adapter/src/ring/adapter/jetty.clj
@@ -24,7 +24,9 @@
   "Creates a new SslContextFactory instance from a map of options."
   [options]
   (let [context (SslContextFactory.)]
-    (.setKeyStorePath context (options :keystore))
+    (if (string? (options :keystore))
+      (.setKeyStorePath context (options :keystore))
+      (.setKeyStore context (options :keystore)))
     (.setKeyStorePassword context (options :key-password))
     (when (options :truststore)
       (.setTrustStore context (options :truststore)))