qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From grk...@apache.org
Subject svn commit: r981105 - /qpid/trunk/qpid/java/broker/src/main/java/org/apache/log4j/xml/QpidLog4JConfigurator.java
Date Sat, 31 Jul 2010 23:51:19 GMT
Author: grkvlt
Date: Sat Jul 31 23:51:18 2010
New Revision: 981105

URL: http://svn.apache.org/viewvc?rev=981105&view=rev
Log:
QPID-2642: Replace bitwise and with short-circuit and operator

Applied patch from Sorin Suciu <ssuciu@gmail.com>

Modified:
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/log4j/xml/QpidLog4JConfigurator.java

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/log4j/xml/QpidLog4JConfigurator.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/log4j/xml/QpidLog4JConfigurator.java?rev=981105&r1=981104&r2=981105&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/log4j/xml/QpidLog4JConfigurator.java
(original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/log4j/xml/QpidLog4JConfigurator.java
Sat Jul 31 23:51:18 2010
@@ -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



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org


Mime
View raw message