Fix various issues on a fresh dev environment deployment

[lgpl/argeo-commons.git] / eclipse / org.argeo.ext.equinox.jetty / src / org / argeo / equinox / jetty / CmsJettyCustomizer.java

diff --git a/eclipse/org.argeo.ext.equinox.jetty/src/org/argeo/equinox/jetty/CmsJettyCustomizer.java b/eclipse/org.argeo.ext.equinox.jetty/src/org/argeo/equinox/jetty/CmsJettyCustomizer.java
index e34049506b553ee3bd6948dab80de0092dc20c7f..ab291b5456ee2f5a5230c81137462bfe474e760d 100644 (file)
--- a/eclipse/org.argeo.ext.equinox.jetty/src/org/argeo/equinox/jetty/CmsJettyCustomizer.java
+++ b/eclipse/org.argeo.ext.equinox.jetty/src/org/argeo/equinox/jetty/CmsJettyCustomizer.java
@@ -49,15 +49,16 @@ public class CmsJettyCustomizer extends JettyCustomizer {
        @Override
        public Object customizeHttpsConnector(Object connector, Dictionary<String, ?> settings) {
                ServerConnector httpsConnector = (ServerConnector) connector;
-               for (ConnectionFactory connectionFactory : httpsConnector.getConnectionFactories()) {
-                       if (connectionFactory instanceof SslConnectionFactory) {
-                               SslContextFactory.Server sslConnectionFactory = ((SslConnectionFactory) connectionFactory)
-                                               .getSslContextFactory();
-                               sslConnectionFactory.setTrustStorePath((String) settings.get(SSL_TRUSTSTORE));
-                               sslConnectionFactory.setTrustStoreType((String) settings.get(SSL_TRUSTSTORETYPE));
-                               sslConnectionFactory.setTrustStorePassword((String) settings.get(SSL_TRUSTSTOREPASSWORD));
+               if (httpsConnector != null)
+                       for (ConnectionFactory connectionFactory : httpsConnector.getConnectionFactories()) {
+                               if (connectionFactory instanceof SslConnectionFactory) {
+                                       SslContextFactory.Server sslConnectionFactory = ((SslConnectionFactory) connectionFactory)
+                                                       .getSslContextFactory();
+                                       sslConnectionFactory.setTrustStorePath((String) settings.get(SSL_TRUSTSTORE));
+                                       sslConnectionFactory.setTrustStoreType((String) settings.get(SSL_TRUSTSTORETYPE));
+                                       sslConnectionFactory.setTrustStorePassword((String) settings.get(SSL_TRUSTSTOREPASSWORD));
+                               }
                        }
-               }
                return super.customizeHttpsConnector(connector, settings);
        }