Make CmsLog initialisation more robust

diff --git a/org.argeo.api.cms/src/org/argeo/api/cms/CmsLog.java b/org.argeo.api.cms/src/org/argeo/api/cms/CmsLog.java
index 96a09a91b1bfdb496cdf857a0ad4af3d2171aca0..3375bcde51e4f234f31e76b71cc747a1214fa1de 100644 (file)
--- a/org.argeo.api.cms/src/org/argeo/api/cms/CmsLog.java
+++ b/org.argeo.api.cms/src/org/argeo/api/cms/CmsLog.java
@@ -235,7 +235,12 @@ public interface CmsLog {
 
        static CmsLog getLog(String name) {
                if (isSystemLoggerAvailable) {
-                       return new SystemCmsLog(name);
+                       SystemCmsLog systemCmsLog = new SystemCmsLog(name);
+                       if (systemCmsLog.logger == null) {
+                               System.err.println("System logger unexpectedly null for " + name + ", switching to fall back");
+                               return new FallBackCmsLog();
+                       }
+                       return systemCmsLog;
                } else { // typically Android
                        return new FallBackCmsLog();
                }
@@ -259,10 +264,11 @@ public interface CmsLog {
  * Java platform.
  */
 class SystemCmsLog implements CmsLog {
-       private final Logger logger;
+       final Logger logger;
 
        SystemCmsLog(String name) {
                logger = System.getLogger(name);
+               assert logger != null : "System logger should not be null";
        }
 
        @Override

diff --git a/sdk/cms-e4-rap.properties b/sdk/cms-e4-rap.properties
index b3d4d9269431ffb6bcfc2d06cee3eef438b43e69..4fe2113be1af0a536f9473ffd6e3d9ba5c87cab9 100644 (file)
--- a/sdk/cms-e4-rap.properties
+++ b/sdk/cms-e4-rap.properties
@@ -18,10 +18,10 @@ org.argeo.cms.lib.jetty,\
 
 # Local
 argeo.node.repo.type=h2
-#argeo.http.port=7070
+argeo.http.port=7070
 #argeo.http.host=[IP address to listen to]
 #argeo.https.port=7073
-#argeo.sshd.port=2222
+argeo.sshd.port=2222
 
 # Logging
 log.org.argeo=DEBUG