Author: jbellis Date: Tue Sep 21 14:48:47 2010 New Revision: 999445 URL: http://svn.apache.org/viewvc?rev=999445&view=rev Log: invoke getDefaultUncaughtExceptionHandler from DTPE with the original exception rather than the ExecutionException wrapper. patch by jbellis for CASSANDRA-1226
Modified: cassandra/branches/cassandra-0.6/CHANGES.txt cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutor.java Modified: cassandra/branches/cassandra-0.6/CHANGES.txt URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/CHANGES.txt?rev=999445&r1=999444&r2=999445&view=diff ============================================================================== --- cassandra/branches/cassandra-0.6/CHANGES.txt (original) +++ cassandra/branches/cassandra-0.6/CHANGES.txt Tue Sep 21 14:48:47 2010 @@ -25,6 +25,8 @@ * remove tombstones during non-major compactions when bloom filter verifies that row does not exist in other sstables (CASSANDRA-1074) * fix replaying the last mutation in a commitlog unnecessarily (CASSANDRA-1512) + * invoke getDefaultUncaughtExceptionHandler from DTPE with the original + exception rather than the ExecutionException wrapper (CASSANDRA-1226) 0.6.5 Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutor.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutor.java?rev=999445&r1=999444&r2=999445&view=diff ============================================================================== --- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutor.java (original) +++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutor.java Tue Sep 21 14:48:47 2010 @@ -91,7 +91,7 @@ public class DebuggableThreadPoolExecuto } catch (ExecutionException e) { - Thread.getDefaultUncaughtExceptionHandler().uncaughtException(Thread.currentThread(), e); + Thread.getDefaultUncaughtExceptionHandler().uncaughtException(Thread.currentThread(), e.getCause()); } }