From 4717efa81dda8d680713ea506bc50971cd6292ca Mon Sep 17 00:00:00 2001 From: Andrew Donald Kennedy Date: Sat, 31 Jul 2010 23:51:18 +0000 Subject: QPID-2642: Replace bitwise and with short-circuit and operator Applied patch from Sorin Suciu git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@981105 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/org/apache/log4j/xml/QpidLog4JConfigurator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qpid/java') 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 -- cgit v1.2.1