db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r1579766 - /db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/IndexLister.java
Date Thu, 20 Mar 2014 21:37:34 GMT
Author: dag
Date: Thu Mar 20 21:37:34 2014
New Revision: 1579766

URL: http://svn.apache.org/r1579766
Log:
DERBY-5111 NullPointerException on unique constraint violation with unique index

Patch derby-5111.

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/IndexLister.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/IndexLister.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/IndexLister.java?rev=1579766&r1=1579765&r2=1579766&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/IndexLister.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/IndexLister.java
Thu Mar 20 21:37:34 2014
@@ -101,19 +101,6 @@ public class IndexLister
 	}
 
     /**
-	  *	Returns an array of all the index names on a table.
-	  *
-	  *	@return	an array of index names
-	  *
-	  * @exception StandardException		Thrown on error
-	  */
-    public	String[]		getIndexNames()	throws StandardException
-	{
-		if ( indexNames == null ) { getAllIndexes(); }
-		return	ArrayUtil.copy( indexNames );
-	}
-
-    /**
 	  *	Returns an array of distinct index row generators on a table,
 	  * erasing entries for duplicate indexes (which share same conglomerate).
 	  *
@@ -153,8 +140,8 @@ public class IndexLister
 	  */
     public	String[]		getDistinctIndexNames()	throws StandardException
 	{
-		if ( indexNames == null ) { getAllIndexes(); }
-		return	ArrayUtil.copy( indexNames );
+		if ( distinctIndexNames == null ) { getAllIndexes(); }
+		return	ArrayUtil.copy( distinctIndexNames );
 	}
 
 	////////////////////////////////////////////////////////////////////////



Mime
View raw message