X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust-java-agent%2Fjava%2Flttng-ust-agent-log4j%2Forg%2Flttng%2Fust%2Fagent%2Flog4j%2FLttngLog4jAgent.java;h=157ff3fe879395b88b1d0592805537201457a02c;hb=a548b3c1a329855ad7b2be6937a5a378419fb1b3;hp=7677e68ee66e2b2c20773e0675654d24e49f7f46;hpb=460701148b33878a040c1d7fd1bc77613eb34c92;p=lttng-ust.git

diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/org/lttng/ust/agent/log4j/LttngLog4jAgent.java b/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/org/lttng/ust/agent/log4j/LttngLog4jAgent.java
index 7677e68e..157ff3fe 100644
--- a/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/org/lttng/ust/agent/log4j/LttngLog4jAgent.java
+++ b/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/org/lttng/ust/agent/log4j/LttngLog4jAgent.java
@@ -19,6 +19,7 @@ package org.lttng.ust.agent.log4j;
 
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Enumeration;
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
@@ -75,10 +76,12 @@ class LttngLog4jAgent extends AbstractLttngAgent<LttngLogAppender> {
 
 	private static boolean hasLttngAppenderAttached(Category logger) {
 		@SuppressWarnings("unchecked")
-		List<Appender> appenders = Collections.list(logger.getAllAppenders());
-		for (Appender appender : appenders) {
-			if (appender instanceof LttngLogAppender) {
-				return true;
+		Enumeration<Appender> appenders = logger.getAllAppenders();
+		if (appenders != null) {
+			for (Appender appender : Collections.list(appenders)) {
+				if (appender instanceof LttngLogAppender) {
+					return true;
+				}
 			}
 		}