db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bpendle...@apache.org
Subject svn commit: r520699 - /db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.java
Date Wed, 21 Mar 2007 01:46:45 GMT
Author: bpendleton
Date: Tue Mar 20 18:46:45 2007
New Revision: 520699

URL: http://svn.apache.org/viewvc?view=rev&rev=520699
Log:
DERBY-1861: ASSERT when combining references and expressions in ORDER BY

Follow-on patch to ensure that SanityManager references are only generated
in SANE builds. A call to SanityManager.ThrowAssert was not enclosed in
a SanityManager.Debug test, and so was not being optimized out of
insane builds.

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

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.java?view=diff&rev=520699&r1=520698&r2=520699
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.java
Tue Mar 20 18:46:45 2007
@@ -586,7 +586,8 @@
 				}
 				else if (index >= size - orderBySelect)
 				{
-					SanityManager.THROWASSERT(
+					if (SanityManager.DEBUG)
+						SanityManager.THROWASSERT(
 							"Unexpectedly found ORDER BY column '" +
 							columnName + "' pulled up at position " +index);
 				}



Mime
View raw message