Merge "Added stopwatch filter"

diff --git a/src/main/java/org/onap/dmaap/dbcapi/server/JettyServer.java b/src/main/java/org/onap/dmaap/dbcapi/server/JettyServer.java
index 4b578b4..7f34725 100644 (file)
--- a/src/main/java/org/onap/dmaap/dbcapi/server/JettyServer.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/server/JettyServer.java
@@ -137,6 +137,7 @@ public class JettyServer extends BaseLoggingClass {
                String keystore = params.getProperty("KeyStoreFile", "etc/keystore");
                logger.info("https Server using keystore at " + keystore);
                sslContextFactory.setKeyStorePath(keystore);
+               sslContextFactory.setKeyStoreType(params.getProperty("KeyStoreType", "jks"));
                sslContextFactory.setKeyStorePassword(params.getProperty("KeyStorePassword", "changeit"));
                sslContextFactory.setKeyManagerPassword(params.getProperty("KeyPassword", "changeit"));
        }