diff options
| author | Andrew Donald Kennedy <grkvlt@apache.org> | 2010-07-31 23:51:18 +0000 |
|---|---|---|
| committer | Andrew Donald Kennedy <grkvlt@apache.org> | 2010-07-31 23:51:18 +0000 |
| commit | a99c4c02ad621661b95114ae44fe47a0cf67bc4b (patch) | |
| tree | 514698567470b4fc733c1fb1740c9a418831ddf7 /java | |
| parent | 43cb63667d6ddf2bc4a39f4ad1e1910ed5d0abc8 (diff) | |
| download | qpid-python-a99c4c02ad621661b95114ae44fe47a0cf67bc4b.tar.gz | |
QPID-2642: Replace bitwise and with short-circuit and operator
Applied patch from Sorin Suciu <ssuciu@gmail.com>
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@981105 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
| -rw-r--r-- | java/broker/src/main/java/org/apache/log4j/xml/QpidLog4JConfigurator.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/broker/src/main/java/org/apache/log4j/xml/QpidLog4JConfigurator.java b/java/broker/src/main/java/org/apache/log4j/xml/QpidLog4JConfigurator.java index 4afc209ba7..6fa412cce6 100644 --- a/java/broker/src/main/java/org/apache/log4j/xml/QpidLog4JConfigurator.java +++ b/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 |