summaryrefslogtreecommitdiff
path: root/qpid/java
diff options
context:
space:
mode:
Diffstat (limited to 'qpid/java')
-rw-r--r--qpid/java/broker/src/main/java/org/apache/log4j/xml/QpidLog4JConfigurator.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/log4j/xml/QpidLog4JConfigurator.java b/qpid/java/broker/src/main/java/org/apache/log4j/xml/QpidLog4JConfigurator.java
index 4afc209ba7..6fa412cce6 100644
--- a/qpid/java/broker/src/main/java/org/apache/log4j/xml/QpidLog4JConfigurator.java
+++ b/qpid/java/broker/src/main/java/org/apache/log4j/xml/QpidLog4JConfigurator.java
@@ -259,7 +259,7 @@ public class QpidLog4JConfigurator
//let log4j replace any properties in the string
String log4jConfiguredString = domConfig.subst(levelString);
- if(log4jConfiguredString.equals("") & ! log4jConfiguredString.equals(levelString))
+ if(log4jConfiguredString.equals("") && ! log4jConfiguredString.equals(levelString))
{
//log4j has returned an empty string but this isnt what we gave it.
//There may have been an undefined property. Unlike an incorrect