Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 39511 invoked from network); 30 Nov 2010 18:09:03 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 30 Nov 2010 18:09:03 -0000 Received: (qmail 75473 invoked by uid 500); 30 Nov 2010 18:09:03 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 75418 invoked by uid 500); 30 Nov 2010 18:09:03 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 75411 invoked by uid 99); 30 Nov 2010 18:09:03 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Nov 2010 18:09:03 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Nov 2010 18:09:01 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 889E323889E9; Tue, 30 Nov 2010 18:07:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1040662 - in /db/derby/code/branches/10.6: ./ java/engine/org/apache/derby/iapi/services/io/FormatIdInputStream.java Date: Tue, 30 Nov 2010 18:07:28 -0000 To: derby-commits@db.apache.org From: kmarsden@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101130180728.889E323889E9@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kmarsden Date: Tue Nov 30 18:07:28 2010 New Revision: 1040662 URL: http://svn.apache.org/viewvc?rev=1040662&view=rev Log: DERBY-4913 0.3 to 10.5 upgrade fails with ava.io.StreamCorruptedException Add full stack trace with ClassCastException for better diagnostics Modified: db/derby/code/branches/10.6/ (props changed) db/derby/code/branches/10.6/java/engine/org/apache/derby/iapi/services/io/FormatIdInputStream.java Propchange: db/derby/code/branches/10.6/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Nov 30 18:07:28 2010 @@ -1,2 +1,2 @@ -/db/derby/code/trunk:938547,938796,938959,939231,940462,940469,941627,942031,942286,942476,942480,942587,944152,946794,948045,948069,951346,951366,952138,952237,952581,954344,954421,954544,954748,955001,955540,955634,956075,956234,956445,956569,956659,957260,957902,958163,958257,958264,958508,958522,958555,958618,958939,959550,962716,963206,963705,964115,965647,967304,980684,986689,986834,987539,989099,990292,997325,998170,999119,1002291,1002682,1002853,1021426,1025795,1028716,1030043,1033864 +/db/derby/code/trunk:938547,938796,938959,939231,940462,940469,941627,942031,942286,942476,942480,942587,944152,946794,948045,948069,951346,951366,952138,952237,952581,954344,954421,954544,954748,955001,955540,955634,956075,956234,956445,956569,956659,957260,957902,958163,958257,958264,958508,958522,958555,958618,958939,959550,962716,963206,963705,964115,965647,967304,980684,986689,986834,987539,989099,990292,997325,998170,999119,1002291,1002682,1002853,1021426,1025795,1028716,1030043,1033864,1040658 /db/derby/docs/trunk:954344 Modified: db/derby/code/branches/10.6/java/engine/org/apache/derby/iapi/services/io/FormatIdInputStream.java URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.6/java/engine/org/apache/derby/iapi/services/io/FormatIdInputStream.java?rev=1040662&r1=1040661&r2=1040662&view=diff ============================================================================== --- db/derby/code/branches/10.6/java/engine/org/apache/derby/iapi/services/io/FormatIdInputStream.java (original) +++ db/derby/code/branches/10.6/java/engine/org/apache/derby/iapi/services/io/FormatIdInputStream.java Tue Nov 30 18:07:28 2010 @@ -136,7 +136,9 @@ public final class FormatIdInputStream e // they have readExternal (or SQLData) that doesn't match // the writeExternal. and thus the object read is of // the incorrect type, e.g. Integer i = (Integer) in.readObject(); - throw new StreamCorruptedException(cce.toString()); + StreamCorruptedException sce = new StreamCorruptedException(cce.toString()); + sce.initCause(cce); + throw sce; } }