From 36c0ba6709ae9a3974c1d1dce01ebe47c5aec24e Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 2 Jul 2022 14:00:37 +0200
Subject: [PATCH] Fix various issues on a fresh dev environment deployment

---
 .../cms/servlet/internal/jetty/JettyConfig.java |  4 ++--
 .../argeo/equinox/jetty/CmsJettyCustomizer.java | 17 +++++++++--------
 .../cms/internal/runtime/CmsStateImpl.java      |  2 ++
 .../util/directory/ldap/DefaultLdapEntry.java   |  2 +-
 4 files changed, 14 insertions(+), 11 deletions(-)

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 0e2a3e5ca..97321915a 100644
--- 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 e34049506..ab291b545 100644
--- 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 cb07f43eb..47a4b1ff6 100644
--- 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 8db662393..7166710f6 100644
--- 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[]))
-- 
2.30.2