X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FNodeLogger.java;h=fef7a7a30a0e4b308cdca33a374fac8f57e6d849;hb=ed3d525b21f55ed76763381b91c888404487e3e1;hp=158bac70a40159c1bebcb353adf245b355184edd;hpb=d84d867f0b1c4d8a9b251260ef6d5679e40e5c42;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeLogger.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeLogger.java
index 158bac70a..fef7a7a30 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeLogger.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeLogger.java
@@ -86,30 +86,32 @@ class NodeLogger implements ArgeoLogger, LogListener {
 	};
 
 	public NodeLogger(LogReaderService lrs) {
-		Enumeration<LogEntry> logEntries = lrs.getLog();
-		while (logEntries.hasMoreElements())
-			logged(logEntries.nextElement());
-		lrs.addLogListener(this);
-
-		// configure log4j watcher
-		String log4jConfiguration = KernelUtils.getFrameworkProp("log4j.configuration");
-		if (log4jConfiguration != null && log4jConfiguration.startsWith("file:")) {
-			if (log4jConfiguration.contains("..")) {
-				if (log4jConfiguration.startsWith("file://"))
-					log4jConfiguration = log4jConfiguration.substring("file://".length());
-				else if (log4jConfiguration.startsWith("file:"))
-					log4jConfiguration = log4jConfiguration.substring("file:".length());
-			}
-			try {
-				Path log4jconfigPath;
-				if (log4jConfiguration.startsWith("file:"))
-					log4jconfigPath = Paths.get(new URI(log4jConfiguration));
-				else
-					log4jconfigPath = Paths.get(log4jConfiguration);
-				Thread log4jConfWatcher = new Log4jConfWatcherThread(log4jconfigPath);
-				log4jConfWatcher.start();
-			} catch (Exception e) {
-				stdErr("Badly formatted log4j configuration URI " + log4jConfiguration + ": " + e.getMessage());
+		if (lrs != null) {
+			Enumeration<LogEntry> logEntries = lrs.getLog();
+			while (logEntries.hasMoreElements())
+				logged(logEntries.nextElement());
+			lrs.addLogListener(this);
+
+			// configure log4j watcher
+			String log4jConfiguration = KernelUtils.getFrameworkProp("log4j.configuration");
+			if (log4jConfiguration != null && log4jConfiguration.startsWith("file:")) {
+				if (log4jConfiguration.contains("..")) {
+					if (log4jConfiguration.startsWith("file://"))
+						log4jConfiguration = log4jConfiguration.substring("file://".length());
+					else if (log4jConfiguration.startsWith("file:"))
+						log4jConfiguration = log4jConfiguration.substring("file:".length());
+				}
+				try {
+					Path log4jconfigPath;
+					if (log4jConfiguration.startsWith("file:"))
+						log4jconfigPath = Paths.get(new URI(log4jConfiguration));
+					else
+						log4jconfigPath = Paths.get(log4jConfiguration);
+					Thread log4jConfWatcher = new Log4jConfWatcherThread(log4jconfigPath);
+					log4jConfWatcher.start();
+				} catch (Exception e) {
+					stdErr("Badly formatted log4j configuration URI " + log4jConfiguration + ": " + e.getMessage());
+				}
 			}
 		}
 	}