Return-Path: 
 <derby-commits-return-1890-apmail-db-derby-commits-archive=db.apache.org@db.apache.org>
Delivered-To: apmail-db-derby-commits-archive@www.apache.org
Received: (qmail 14194 invoked from network); 2 Dec 2005 01:33:24 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 2 Dec 2005 01:33:24 -0000
Received: (qmail 36635 invoked by uid 500); 2 Dec 2005 01:33:23 -0000
Delivered-To: apmail-db-derby-commits-archive@db.apache.org
Received: (qmail 36569 invoked by uid 500); 2 Dec 2005 01:33:23 -0000
Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:derby-commits-help@db.apache.org>
list-unsubscribe: <mailto:derby-commits-unsubscribe@db.apache.org>
List-Post: <mailto:derby-commits@db.apache.org>
Reply-To: "Derby Development" <derby-dev@db.apache.org>
List-Id: <derby-commits.db.apache.org>
Delivered-To: mailing list derby-commits@db.apache.org
Received: (qmail 36558 invoked by uid 99); 2 Dec 2005 01:33:22 -0000
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Thu, 01 Dec 2005 17:33:22 -0800
Received: (qmail 14112 invoked by uid 65534); 2 Dec 2005 01:33:02 -0000
Message-ID: <20051202013302.14111.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r351550 -
 /db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryLogicalOperatorNode.java
Date: Fri, 02 Dec 2005 01:33:02 -0000
To: derby-commits@db.apache.org
From: djd@apache.org
X-Mailer: svnmailer-1.0.5
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: djd
Date: Thu Dec  1 17:32:58 2005
New Revision: 351550

URL: http://svn.apache.org/viewcvs?rev=351550&view=rev
Log:
Update comment in generateExpression to correctly reflect the code.

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryLogicalOperatorNode.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryLogicalOperatorNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryLogicalOperatorNode.java?rev=351550&r1=351549&r2=351550&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryLogicalOperatorNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryLogicalOperatorNode.java Thu Dec  1 17:32:58 2005
@@ -143,12 +143,12 @@
 		/*
 		** This generates the following code:
 		**
-		** (<fieldx> = <leftOperand>).equals(shortCircuitValue) ?
+		** (<leftOperand>.equals(shortCircuitValue) ?
 		**	 <fieldy> = <shortCircuitValue, nullability> :
-		**   fieldx.<and/or>(<rightOperand>, nullability)
+		**   <leftOperand>.<and/or>(<rightOperand>, nullability)
 		**
 		** The ?: operator accomplishes the short-circuiting.  We save the
-		** value of the left operand in a field so we don't have to evaluate
+		** value of the left operand on the stack so we don't have to evaluate
 		** it twice.  We save the return value of the getBoolean() call so
 		** we can re-use that object rather than allocate a new one every
 		** time this method is called.