X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Flttng-ust-java-agent%2Fjava%2Flttng-ust-agent-log4j2%2Forg%2Flttng%2Fust%2Fagent%2Flog4j2%2FLttngLogAppender.java;h=08612f57cd2f5bcdb93137fd7101b05637377cff;hb=8063c7b022fdde06813466a21c0fcfc2d8206b56;hp=9c093fa8ed0ee7dec54293277584457716d5ccfa;hpb=61c70d3794a4e8c965bbdbdd19934374ab83a70d;p=lttng-ust.git

diff --git a/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j2/org/lttng/ust/agent/log4j2/LttngLogAppender.java b/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j2/org/lttng/ust/agent/log4j2/LttngLogAppender.java
index 9c093fa8..08612f57 100644
--- a/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j2/org/lttng/ust/agent/log4j2/LttngLogAppender.java
+++ b/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j2/org/lttng/ust/agent/log4j2/LttngLogAppender.java
@@ -25,6 +25,7 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
 import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
 import org.apache.logging.log4j.core.config.plugins.PluginElement;
 import org.apache.logging.log4j.core.config.plugins.PluginFactory;
+import org.apache.logging.log4j.message.Message;
 import org.lttng.ust.agent.ILttngHandler;
 import org.lttng.ust.agent.context.ContextInfoSerializer;
 
@@ -164,10 +165,21 @@ public final class LttngLogAppender extends AbstractAppender implements ILttngHa
 		 * Check if the current message should be logged, according to the UST session
 		 * settings.
 		 */
-		if (!agent.isEventEnabled(event.getLoggerName())) {
+		String loggername = event.getLoggerName();
+		if (loggername == null || !agent.isEventEnabled(loggername)) {
 			return;
 		}
 
+		/*
+		 * Default value if the Message is null.
+		 */
+		String message = "";
+
+		Message eventMessage = event.getMessage();
+		if (eventMessage != null) {
+			message = eventMessage.getFormattedMessage();
+		}
+
 		/*
 		 * Default values if the StackTraceElement is null.
 		 */
@@ -191,8 +203,8 @@ public final class LttngLogAppender extends AbstractAppender implements ILttngHa
 
 		eventCount.incrementAndGet();
 
-		LttngLog4j2Api.tracepointWithContext(event.getMessage().getFormattedMessage(), event.getLoggerName(), classname,
-				methodname, filename, line, event.getTimeMillis(), event.getLevel().intLevel(), event.getThreadName(),
+		LttngLog4j2Api.tracepointWithContext(message, loggername, classname, methodname, filename, line,
+				event.getTimeMillis(), event.getLevel().intLevel(), event.getThreadName(),
 				contextInfo.getEntriesArray(), contextInfo.getStringsArray());
 	}
 }