Fix various issues on a fresh dev environment deployment

diff --git a/eclipse/org.argeo.cms.servlet/src/org/argeo/cms/servlet/internal/jetty/JettyConfig.java b/eclipse/org.argeo.cms.servlet/src/org/argeo/cms/servlet/internal/jetty/JettyConfig.java
index 0e2a3e5cab4e8594d9df364ffbe8d911f3799165..97321915ac29f7e7aaa65d480fe1683566f97ecf 100644 (file)
--- a/eclipse/org.argeo.cms.servlet/src/org/argeo/cms/servlet/internal/jetty/JettyConfig.java
+++ b/eclipse/org.argeo.cms.servlet/src/org/argeo/cms/servlet/internal/jetty/JettyConfig.java
@@ -131,9 +131,9 @@ public class JettyConfig {
                                        }
                                        tryCount--;
                                }
-                               long duration = System.currentTimeMillis() - begin;
-                               log.error("Gave up with starting Jetty server after " + (duration / 1000) + " s");
                        }
+                       long duration = System.currentTimeMillis() - begin;
+                       log.error("Gave up with starting Jetty server after " + (duration / 1000) + " s");
                } catch (Exception e) {
                        log.error("Cannot start default Jetty server with config " + properties, e);
                }

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);
        }
 

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsStateImpl.java b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsStateImpl.java
index cb07f43eb17eea2af0bf290c3445916fbb3198f8..47a4b1ff6c3c61301fdf7839d8072eb780dcf5f6 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsStateImpl.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsStateImpl.java
@@ -355,6 +355,8 @@ public class CmsStateImpl implements CmsState {
        public static void prepareFirstInitInstanceArea(List<String> nodeInits) {
 
                for (String nodeInit : nodeInits) {
+                       if(nodeInit==null)
+                               continue;
 
                        if (nodeInit.startsWith("http")) {
                                // TODO reconnect it

diff --git a/org.argeo.util/src/org/argeo/util/directory/ldap/DefaultLdapEntry.java b/org.argeo.util/src/org/argeo/util/directory/ldap/DefaultLdapEntry.java
index 8db662393e5ee1fb702664465a2692616ef17e68..7166710f61191e594dd776714d6b7bd56f73d459 100644 (file)
--- a/org.argeo.util/src/org/argeo/util/directory/ldap/DefaultLdapEntry.java
+++ b/org.argeo.util/src/org/argeo/util/directory/ldap/DefaultLdapEntry.java
@@ -164,7 +164,7 @@ public class DefaultLdapEntry implements LdapEntry {
                        return false;
                }
 
-               Object storedValue = credentials.get(key);
+               Object storedValue = getCredentials().get(key);
                if (storedValue == null || value == null)
                        return false;
                if (!(value instanceof String || value instanceof byte[]))