db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r536517 - /db/derby/code/branches/10.2/java/engine/org/apache/derby/iapi/sql/dictionary/SPSDescriptor.java
Date Wed, 09 May 2007 13:32:06 GMT
Author: kahatlen
Date: Wed May  9 06:32:05 2007
New Revision: 536517

URL: http://svn.apache.org/viewvc?view=rev&rev=536517
Log:
DERBY-2584: Creating a database with JPOX SchemaTool sometimes gives
ArrayIndexOutOfBoundsException when getIndexInfo() is called

Merged from trunk (revision 536516).

Modified:
    db/derby/code/branches/10.2/java/engine/org/apache/derby/iapi/sql/dictionary/SPSDescriptor.java

Modified: db/derby/code/branches/10.2/java/engine/org/apache/derby/iapi/sql/dictionary/SPSDescriptor.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/engine/org/apache/derby/iapi/sql/dictionary/SPSDescriptor.java?view=diff&rev=536517&r1=536516&r2=536517
==============================================================================
--- db/derby/code/branches/10.2/java/engine/org/apache/derby/iapi/sql/dictionary/SPSDescriptor.java
(original)
+++ db/derby/code/branches/10.2/java/engine/org/apache/derby/iapi/sql/dictionary/SPSDescriptor.java
Wed May  9 06:32:05 2007
@@ -725,6 +725,12 @@
 					nestedTC = null;
 				}
 
+				// DERBY-2584: If the first attempt to compile the query fails,
+				// we need to reset initiallyCompilable to make sure the
+				// prepared plan is fully stored to disk. Save the initial
+				// value here.
+				final boolean compilable = initiallyCompilable;
+
 				try
 				{
 					prepareAndRelease(lcc, null, nestedTC);
@@ -742,6 +748,7 @@
 						}
 						// if we couldn't do this with a nested xaction, retry with
 						// parent-- we need to wait this time!
+						initiallyCompilable = compilable;
 						prepareAndRelease(lcc, null, null);
 						updateSYSSTATEMENTS(lcc, RECOMPILE, null);
 					}



Mime
View raw message