Return-Path: Delivered-To: apmail-qpid-commits-archive@www.apache.org Received: (qmail 27241 invoked from network); 31 Jul 2010 23:52:36 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 31 Jul 2010 23:52:36 -0000 Received: (qmail 26672 invoked by uid 500); 31 Jul 2010 23:52:36 -0000 Delivered-To: apmail-qpid-commits-archive@qpid.apache.org Received: (qmail 26644 invoked by uid 500); 31 Jul 2010 23:52:36 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 26637 invoked by uid 99); 31 Jul 2010 23:52:36 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 31 Jul 2010 23:52:36 +0000 X-ASF-Spam-Status: No, hits=-1999.4 required=10.0 tests=ALL_TRUSTED,HK_RANDOM_ENVFROM X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 31 Jul 2010 23:52:35 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5B0542388906; Sat, 31 Jul 2010 23:51:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@qpid.apache.org From: grkvlt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100731235119.5B0542388906@eris.apache.org> 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 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