You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by ka...@apache.org on 2007/04/24 10:23:05 UTC
svn commit: r531827 - in /db/derby/code/trunk/java/engine/org/apache/derby:
iapi/sql/dictionary/ iapi/store/access/xa/ iapi/types/ impl/io/
impl/services/bytecode/ impl/services/jce/ impl/sql/ impl/sql/compile/
impl/store/access/ impl/store/access/btre...
Author: kahatlen
Date: Tue Apr 24 01:23:03 2007
New Revision: 531827
URL: http://svn.apache.org/viewvc?view=rev&rev=531827
Log:
DERBY-2581: Callers of SanityManager.THROWASSERT should chain the exceptions when possible
Modified:
db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/PermissionsDescriptor.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/xa/XAXactId.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/BinaryDecimal.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/CollatorSQLChar.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/CollatorSQLClob.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/CollatorSQLLongvarchar.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/CollatorSQLVarchar.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBinary.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLChar.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLClob.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLDouble.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLLongvarchar.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNClob.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNationalChar.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNationalLongvarchar.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNationalVarchar.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLVarchar.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirFile.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirFile4.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCJava.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/GClass.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherProvider.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericPreparedStatement.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryRelationalOperatorNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NewInvocationNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SumAvgAggregateDefinition.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryComparisonOperatorNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransactionContext.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/ControlRow.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking3.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/InternalXact.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/TransactionTableEntry.java
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/PermissionsDescriptor.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/PermissionsDescriptor.java?view=diff&rev=531827&r1=531826&r2=531827
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/PermissionsDescriptor.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/PermissionsDescriptor.java Tue Apr 24 01:23:03 2007
@@ -56,7 +56,8 @@
catch( java.lang.CloneNotSupportedException cnse)
{
if( SanityManager.DEBUG)
- SanityManager.THROWASSERT( "Could not clone a " + getClass().getName());
+ SanityManager.THROWASSERT("Could not clone a " +
+ getClass().getName(), cnse);
return null;
}
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/xa/XAXactId.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/xa/XAXactId.java?view=diff&rev=531827&r1=531826&r2=531827
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/xa/XAXactId.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/xa/XAXactId.java Tue Apr 24 01:23:03 2007
@@ -276,7 +276,7 @@
// this class only knows how to compare with other Xids
if (SanityManager.DEBUG)
SanityManager.THROWASSERT("comparing XAXactId with " +
- other.getClass().getName());
+ other.getClass().getName(), cce);
return false;
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/BinaryDecimal.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/BinaryDecimal.java?view=diff&rev=531827&r1=531826&r2=531827
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/BinaryDecimal.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/BinaryDecimal.java Tue Apr 24 01:23:03 2007
@@ -167,7 +167,7 @@
}
catch (StandardException se)
{
- SanityManager.THROWASSERT(se.toString());
+ SanityManager.THROWASSERT(se);
}
}
@@ -183,7 +183,7 @@
}
catch (StandardException se)
{
- SanityManager.THROWASSERT(se.toString());
+ SanityManager.THROWASSERT(se);
}
}
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/CollatorSQLChar.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/CollatorSQLChar.java?view=diff&rev=531827&r1=531826&r2=531827
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/CollatorSQLChar.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/CollatorSQLChar.java Tue Apr 24 01:23:03 2007
@@ -100,7 +100,7 @@
catch (StandardException se)
{
if (SanityManager.DEBUG)
- SanityManager.THROWASSERT("Unexpected exception " + se);
+ SanityManager.THROWASSERT("Unexpected exception", se);
return null;
}
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/CollatorSQLClob.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/CollatorSQLClob.java?view=diff&rev=531827&r1=531826&r2=531827
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/CollatorSQLClob.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/CollatorSQLClob.java Tue Apr 24 01:23:03 2007
@@ -100,7 +100,7 @@
catch (StandardException se)
{
if (SanityManager.DEBUG)
- SanityManager.THROWASSERT("Unexpected exception " + se);
+ SanityManager.THROWASSERT("Unexpected exception", se);
return null;
}
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/CollatorSQLLongvarchar.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/CollatorSQLLongvarchar.java?view=diff&rev=531827&r1=531826&r2=531827
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/CollatorSQLLongvarchar.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/CollatorSQLLongvarchar.java Tue Apr 24 01:23:03 2007
@@ -100,7 +100,7 @@
catch (StandardException se)
{
if (SanityManager.DEBUG)
- SanityManager.THROWASSERT("Unexpected exception " + se);
+ SanityManager.THROWASSERT("Unexpected exception", se);
return null;
}
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/CollatorSQLVarchar.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/CollatorSQLVarchar.java?view=diff&rev=531827&r1=531826&r2=531827
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/CollatorSQLVarchar.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/CollatorSQLVarchar.java Tue Apr 24 01:23:03 2007
@@ -100,7 +100,7 @@
catch (StandardException se)
{
if (SanityManager.DEBUG)
- SanityManager.THROWASSERT("Unexpected exception " + se);
+ SanityManager.THROWASSERT("Unexpected exception", se);
return null;
}
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBinary.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBinary.java?view=diff&rev=531827&r1=531826&r2=531827
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBinary.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBinary.java Tue Apr 24 01:23:03 2007
@@ -532,7 +532,7 @@
catch (StandardException se)
{
if (SanityManager.DEBUG)
- SanityManager.THROWASSERT("Unexpected exception " + se);
+ SanityManager.THROWASSERT("Unexpected exception", se);
return null;
}
}
@@ -1060,7 +1060,7 @@
catch (StandardException se)
{
if (SanityManager.DEBUG)
- SanityManager.THROWASSERT("Unexpected exception " + se);
+ SanityManager.THROWASSERT("Unexpected exception", se);
return 0;
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLChar.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLChar.java?view=diff&rev=531827&r1=531826&r2=531827
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLChar.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLChar.java Tue Apr 24 01:23:03 2007
@@ -940,7 +940,7 @@
catch (StandardException se)
{
if (SanityManager.DEBUG)
- SanityManager.THROWASSERT("Unexpected exception " + se);
+ SanityManager.THROWASSERT("Unexpected exception", se);
return null;
}
}
@@ -2490,7 +2490,7 @@
catch (StandardException se)
{
if (SanityManager.DEBUG)
- SanityManager.THROWASSERT("Unexpected exception " + se);
+ SanityManager.THROWASSERT("Unexpected exception", se);
return 0;
}
@@ -2543,7 +2543,7 @@
{
if (SanityManager.DEBUG)
{
- SanityManager.THROWASSERT("Unexpected exception " + se);
+ SanityManager.THROWASSERT("Unexpected exception", se);
}
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLClob.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLClob.java?view=diff&rev=531827&r1=531826&r2=531827
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLClob.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLClob.java Tue Apr 24 01:23:03 2007
@@ -81,7 +81,7 @@
catch (StandardException se)
{
if (SanityManager.DEBUG)
- SanityManager.THROWASSERT("Unexpected exception " + se);
+ SanityManager.THROWASSERT("Unexpected exception", se);
return null;
}
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLDouble.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLDouble.java?view=diff&rev=531827&r1=531826&r2=531827
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLDouble.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLDouble.java Tue Apr 24 01:23:03 2007
@@ -290,9 +290,9 @@
{
if (SanityManager.DEBUG)
SanityManager.THROWASSERT(
- "error on clone, se = " + se +
+ "error on clone, " +
" value = " + value +
- " isnull = " + isnull);
+ " isnull = " + isnull, se);
return null;
}
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLLongvarchar.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLLongvarchar.java?view=diff&rev=531827&r1=531826&r2=531827
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLLongvarchar.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLLongvarchar.java Tue Apr 24 01:23:03 2007
@@ -81,7 +81,7 @@
catch (StandardException se)
{
if (SanityManager.DEBUG)
- SanityManager.THROWASSERT("Unexpected exception " + se);
+ SanityManager.THROWASSERT("Unexpected exception", se);
return null;
}
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNClob.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNClob.java?view=diff&rev=531827&r1=531826&r2=531827
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNClob.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNClob.java Tue Apr 24 01:23:03 2007
@@ -90,9 +90,9 @@
}
catch (StandardException se)
{
- if (SanityManager.DEBUG)
- SanityManager.THROWASSERT("Unexpected exception " + se);
- return null;
+ if (SanityManager.DEBUG)
+ SanityManager.THROWASSERT("Unexpected exception", se);
+ return null;
}
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNationalChar.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNationalChar.java?view=diff&rev=531827&r1=531826&r2=531827
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNationalChar.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNationalChar.java Tue Apr 24 01:23:03 2007
@@ -114,7 +114,7 @@
catch (StandardException se)
{
if (SanityManager.DEBUG)
- SanityManager.THROWASSERT("Unexpected exception " + se);
+ SanityManager.THROWASSERT("Unexpected exception", se);
return null;
}
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNationalLongvarchar.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNationalLongvarchar.java?view=diff&rev=531827&r1=531826&r2=531827
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNationalLongvarchar.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNationalLongvarchar.java Tue Apr 24 01:23:03 2007
@@ -90,7 +90,7 @@
catch (StandardException se)
{
if (SanityManager.DEBUG)
- SanityManager.THROWASSERT("Unexpected exception " + se);
+ SanityManager.THROWASSERT("Unexpected exception", se);
return null;
}
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNationalVarchar.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNationalVarchar.java?view=diff&rev=531827&r1=531826&r2=531827
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNationalVarchar.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNationalVarchar.java Tue Apr 24 01:23:03 2007
@@ -97,7 +97,7 @@
catch (StandardException se)
{
if (SanityManager.DEBUG)
- SanityManager.THROWASSERT("Unexpected exception " + se);
+ SanityManager.THROWASSERT("Unexpected exception", se);
return null;
}
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLVarchar.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLVarchar.java?view=diff&rev=531827&r1=531826&r2=531827
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLVarchar.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLVarchar.java Tue Apr 24 01:23:03 2007
@@ -80,7 +80,7 @@
catch (StandardException se)
{
if (SanityManager.DEBUG)
- SanityManager.THROWASSERT("Unexpected exception " + se);
+ SanityManager.THROWASSERT("Unexpected exception", se);
return null;
}
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirFile.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirFile.java?view=diff&rev=531827&r1=531826&r2=531827
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirFile.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirFile.java Tue Apr 24 01:23:03 2007
@@ -175,7 +175,8 @@
// problem is
if (SanityManager.DEBUG)
{
- SanityManager.THROWASSERT("Unable to create Exclusive Lock File " + getPath());
+ SanityManager.THROWASSERT(
+ "Unable to create Exclusive Lock File " + getPath(), ioe);
}
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirFile4.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirFile4.java?view=diff&rev=531827&r1=531826&r2=531827
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirFile4.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirFile4.java Tue Apr 24 01:23:03 2007
@@ -184,7 +184,7 @@
if (SanityManager.DEBUG)
{
SanityManager.THROWASSERT("Unable to Acquire Exclusive Lock on "
- + getPath());
+ + getPath(), ioe);
}
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCJava.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCJava.java?view=diff&rev=531827&r1=531826&r2=531827
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCJava.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCJava.java Tue Apr 24 01:23:03 2007
@@ -254,7 +254,7 @@
} catch (StandardException se) {
if (SanityManager.DEBUG) {
- SanityManager.THROWASSERT("Unexpected exception " + se, se);
+ SanityManager.THROWASSERT("Unexpected exception", se);
}
/*
@@ -281,7 +281,7 @@
} catch (StandardException se) {
if (SanityManager.DEBUG) {
- SanityManager.THROWASSERT("Unexpected exception " + se, se);
+ SanityManager.THROWASSERT("Unexpected exception", se);
}
/*
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/GClass.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/GClass.java?view=diff&rev=531827&r1=531826&r2=531827
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/GClass.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/GClass.java Tue Apr 24 01:23:03 2007
@@ -88,7 +88,7 @@
fis.close();
} catch (IOException e) {
if (SanityManager.DEBUG)
- SanityManager.THROWASSERT("Unable to write .class file");
+ SanityManager.THROWASSERT("Unable to write .class file", e);
}
}
}
@@ -130,7 +130,7 @@
else
cf.loadApplicationClass(typeName);
} catch (ClassNotFoundException cnfe) {
- SanityManager.THROWASSERT("Class "+typeName+" not found");
+ SanityManager.THROWASSERT("Class "+typeName+" not found", cnfe);
}
// all the checks succeeded, it must be okay.
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherProvider.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherProvider.java?view=diff&rev=531827&r1=531826&r2=531827
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherProvider.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherProvider.java Tue Apr 24 01:23:03 2007
@@ -256,7 +256,7 @@
{
// should never happen
if (SanityManager.DEBUG)
- SanityManager.THROWASSERT("Illegal state exception");
+ SanityManager.THROWASSERT(ise);
}
catch (GeneralSecurityException gse)
{
@@ -338,7 +338,7 @@
{
// should never happen
if (SanityManager.DEBUG)
- SanityManager.THROWASSERT("Illegal state exception");
+ SanityManager.THROWASSERT(ise);
}
catch (GeneralSecurityException gse)
{
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericPreparedStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericPreparedStatement.java?view=diff&rev=531827&r1=531826&r2=531827
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericPreparedStatement.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericPreparedStatement.java Tue Apr 24 01:23:03 2007
@@ -558,9 +558,7 @@
{
if (SanityManager.DEBUG)
{
- se.printStackTrace(System.out);
- SanityManager.THROWASSERT(
- "Unexpected exception - " + se);
+ SanityManager.THROWASSERT("Unexpected exception", se);
}
}
}
@@ -1127,9 +1125,7 @@
{
if (SanityManager.DEBUG)
{
- se.printStackTrace(System.out);
- SanityManager.THROWASSERT(
- "Unexpected exception - " + se);
+ SanityManager.THROWASSERT("Unexpected exception", se);
}
}
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryRelationalOperatorNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryRelationalOperatorNode.java?view=diff&rev=531827&r1=531826&r2=531827
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryRelationalOperatorNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryRelationalOperatorNode.java Tue Apr 24 01:23:03 2007
@@ -412,8 +412,7 @@
if (SanityManager.DEBUG)
{
SanityManager.THROWASSERT("Failed when trying to " +
- "find base table number for column reference check:\n" +
- se.getMessage());
+ "find base table number for column reference check:", se);
}
}
@@ -1600,8 +1599,7 @@
if (SanityManager.DEBUG)
{
SanityManager.THROWASSERT("Failed when trying to " +
- "find base table numbers for reference check:\n" +
- se.getMessage());
+ "find base table numbers for reference check:", se);
}
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NewInvocationNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NewInvocationNode.java?view=diff&rev=531827&r1=531826&r2=531827
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NewInvocationNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NewInvocationNode.java Tue Apr 24 01:23:03 2007
@@ -223,8 +223,7 @@
*/
if (SanityManager.DEBUG)
{
- SanityManager.THROWASSERT(
- "Unexpected exception - " + cnfe);
+ SanityManager.THROWASSERT("Unexpected exception", cnfe);
}
return null;
}
@@ -476,8 +475,7 @@
*/
if (SanityManager.DEBUG)
{
- SanityManager.THROWASSERT(
- "Unexpected ClassNotFoundException for javaClassName");
+ SanityManager.THROWASSERT("Unexpected exception", e);
}
return null;
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SumAvgAggregateDefinition.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SumAvgAggregateDefinition.java?view=diff&rev=531827&r1=531826&r2=531827
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SumAvgAggregateDefinition.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SumAvgAggregateDefinition.java Tue Apr 24 01:23:03 2007
@@ -106,7 +106,7 @@
{
if (SanityManager.DEBUG)
{
- SanityManager.THROWASSERT("Unexpected exception " + e);
+ SanityManager.THROWASSERT("Unexpected exception", e);
}
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryComparisonOperatorNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryComparisonOperatorNode.java?view=diff&rev=531827&r1=531826&r2=531827
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryComparisonOperatorNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryComparisonOperatorNode.java Tue Apr 24 01:23:03 2007
@@ -241,8 +241,8 @@
if (SanityManager.DEBUG)
{
SanityManager.THROWASSERT("Failed when trying to " +
- "find base table number for column reference check:\n" +
- se.getMessage());
+ "find base table number for column reference check:",
+ se);
}
}
crTables.and(cRefTables);
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransactionContext.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransactionContext.java?view=diff&rev=531827&r1=531826&r2=531827
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransactionContext.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransactionContext.java Tue Apr 24 01:23:03 2007
@@ -91,7 +91,7 @@
// RESOLVE - what to do in error case.
if (SanityManager.DEBUG)
SanityManager.THROWASSERT(
- "got error while invalidating cache.");
+ "got error while invalidating cache.", se);
}
transaction.closeControllers(true /* close held controllers */ );
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/ControlRow.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/ControlRow.java?view=diff&rev=531827&r1=531826&r2=531827
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/ControlRow.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/ControlRow.java Tue Apr 24 01:23:03 2007
@@ -503,10 +503,10 @@
if (SanityManager.DEBUG)
{
SanityManager.THROWASSERT(
- "setLeftSibling got an exception: " + se +
+ "setLeftSibling got an exception: " +
"control_row = " + this +
"trying to update field number " + CR_LEFTSIB_COLID +
- "to new value " + this.leftSiblingPageNumber);
+ "to new value " + this.leftSiblingPageNumber, se);
}
throw(se);
}
@@ -560,10 +560,10 @@
if (SanityManager.DEBUG)
{
SanityManager.THROWASSERT(
- "setRightSibling got an exception: " + se +
+ "setRightSibling got an exception: " +
"control_row = " + this +
"trying to update field number " + CR_RIGHTSIB_COLID +
- "to new value " + this.rightSiblingPageNumber);
+ "to new value " + this.rightSiblingPageNumber, se);
}
throw(se);
}
@@ -672,10 +672,10 @@
if (SanityManager.DEBUG)
{
SanityManager.THROWASSERT(
- "setParent got an exception: " + se +
+ "setParent got an exception: " +
"control_row = " + this +
"trying to update field number " + CR_PARENT_COLID +
- "to new value " + this.parentPageNumber);
+ "to new value " + this.parentPageNumber, se);
}
throw(se);
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking3.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking3.java?view=diff&rev=531827&r1=531826&r2=531827
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking3.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking3.java Tue Apr 24 01:23:03 2007
@@ -881,7 +881,7 @@
catch (StandardException se)
{
if (SanityManager.DEBUG)
- SanityManager.THROWASSERT("error from make RecordHandle.");
+ SanityManager.THROWASSERT(se);
}
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/InternalXact.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/InternalXact.java?view=diff&rev=531827&r1=531826&r2=531827
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/InternalXact.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/InternalXact.java Tue Apr 24 01:23:03 2007
@@ -143,7 +143,7 @@
catch (StandardException se)
{
if (SanityManager.DEBUG)
- SanityManager.THROWASSERT("unexpected exception: " + se);
+ SanityManager.THROWASSERT("unexpected exception", se);
}
}
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/TransactionTableEntry.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/TransactionTableEntry.java?view=diff&rev=531827&r1=531826&r2=531827
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/TransactionTableEntry.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/TransactionTableEntry.java Tue Apr 24 01:23:03 2007
@@ -551,7 +551,8 @@
if (SanityManager.DEBUG)
{
SanityManager.THROWASSERT(
- "TransactionTableEntry cloneable but throws CloneNotSupportedException " + e);
+ "TransactionTableEntry cloneable but throws " +
+ "CloneNotSupportedException", e);
}
return null;
}