db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r1040670 - in /db/derby/code/branches/10.5: ./ java/engine/org/apache/derby/iapi/services/io/FormatIdInputStream.java
Date Tue, 30 Nov 2010 18:21:54 GMT
Author: kmarsden
Date: Tue Nov 30 18:21:54 2010
New Revision: 1040670

URL: http://svn.apache.org/viewvc?rev=1040670&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.5/   (props changed)
    db/derby/code/branches/10.5/java/engine/org/apache/derby/iapi/services/io/FormatIdInputStream.java

Propchange: db/derby/code/branches/10.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 30 18:21:54 2010
@@ -1,2 +1,2 @@
 /db/derby/code/branches/10.6:942027,957000,962738,965351,987678
-/db/derby/code/trunk:757811,769596,769602,769606,769962,772090,772337,772449,772534,774281,777105,779681,782991,785131,785139,785163,785570,785662,788369,788670,788674,788968,789264,790218,791027,792434,793089,793588,794106,794303,794955,795166,795459,796020,796027,796316,796372,797147,798347,798742,800523,803548,803948,805696,808494,808850,809643,810860,812669,816531,816536,819006,822289,823659,824694,827505,829022,829410,830545,831304,831319,832379,833430,835286,881074,881444,882732,884163,885421,885659,887246,888311,892912,897161,898635,901165,901648,901760,902857,903108,905224,908418,908586,909176,910481,910511,911315,911793,915733,916075,916897,918152,918359,921028,927430,928065,929085,934474,936215,938959,940462,940469,942286,942476,942480,942587,946794,948045,948069,951346,951366,952138,952581,954748,955001,955634,956075,956445,956659,958163,959550,962716,965647,967304,980684,986689,986834,999119,1002291,1002682,1002853,1021426,1025795
+/db/derby/code/trunk:757811,769596,769602,769606,769962,772090,772337,772449,772534,774281,777105,779681,782991,785131,785139,785163,785570,785662,788369,788670,788674,788968,789264,790218,791027,792434,793089,793588,794106,794303,794955,795166,795459,796020,796027,796316,796372,797147,798347,798742,800523,803548,803948,805696,808494,808850,809643,810860,812669,816531,816536,819006,822289,823659,824694,827505,829022,829410,830545,831304,831319,832379,833430,835286,881074,881444,882732,884163,885421,885659,887246,888311,892912,897161,898635,901165,901648,901760,902857,903108,905224,908418,908586,909176,910481,910511,911315,911793,915733,916075,916897,918152,918359,921028,927430,928065,929085,934474,936215,938959,940462,940469,942286,942476,942480,942587,946794,948045,948069,951346,951366,952138,952581,954748,955001,955634,956075,956445,956659,958163,959550,962716,965647,967304,980684,986689,986834,999119,1002291,1002682,1002853,1021426,1025795,1040658

Modified: db/derby/code/branches/10.5/java/engine/org/apache/derby/iapi/services/io/FormatIdInputStream.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/java/engine/org/apache/derby/iapi/services/io/FormatIdInputStream.java?rev=1040670&r1=1040669&r2=1040670&view=diff
==============================================================================
--- db/derby/code/branches/10.5/java/engine/org/apache/derby/iapi/services/io/FormatIdInputStream.java
(original)
+++ db/derby/code/branches/10.5/java/engine/org/apache/derby/iapi/services/io/FormatIdInputStream.java
Tue Nov 30 18:21:54 2010
@@ -137,7 +137,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