db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
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 GMT
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;
 		}
 	}
 



Mime
View raw message