[teiid-commits] teiid SVN: r2516 - in branches/7.1.x/client/src/main/java/org/teiid: client/util and 1 other directory.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2010-09-01 13:53:53 -0400 (Wed, 01 Sep 2010)
New Revision: 2516

Modified:
   branches/7.1.x/client/src/main/java/org/teiid/adminapi/impl/VDBMetaData.java
   branches/7.1.x/client/src/main/java/org/teiid/client/util/ExceptionHolder.java
Log:
updating exception holder to ignore all errors when attempting to load from bytes

Modified: branches/7.1.x/client/src/main/java/org/teiid/adminapi/impl/VDBMetaData.java
===================================================================
--- branches/7.1.x/client/src/main/java/org/teiid/adminapi/impl/VDBMetaData.java	2010-09-01 17:26:12 UTC (rev 2515)
+++ branches/7.1.x/client/src/main/java/org/teiid/adminapi/impl/VDBMetaData.java	2010-09-01 17:53:53 UTC (rev 2516)
@@ -45,7 +45,6 @@
 import org.teiid.adminapi.Translator;
 import org.teiid.adminapi.VDB;
 import org.teiid.adminapi.impl.ModelMetaData.ValidationError;
-import org.teiid.core.util.FileUtils;
 import org.teiid.core.util.StringUtil;
 
 

Modified: branches/7.1.x/client/src/main/java/org/teiid/client/util/ExceptionHolder.java
===================================================================
--- branches/7.1.x/client/src/main/java/org/teiid/client/util/ExceptionHolder.java	2010-09-01 17:26:12 UTC (rev 2515)
+++ branches/7.1.x/client/src/main/java/org/teiid/client/util/ExceptionHolder.java	2010-09-01 17:53:53 UTC (rev 2516)
@@ -173,14 +173,14 @@
 		}
 	}
 	
-	private Throwable readFromByteArray(byte[] contents) throws IOException {
+	private Throwable readFromByteArray(byte[] contents) {
 		// only for top level we would have the contents as not null.
 		if (contents != null) {
 			ByteArrayInputStream bais = new ByteArrayInputStream(contents);
-			ObjectInputStream ois = new ObjectInputStreamWithClassloader(bais, ExceptionHolder.class.getClassLoader());
 			try {
+				ObjectInputStream ois = new ObjectInputStreamWithClassloader(bais, ExceptionHolder.class.getClassLoader());
 				return (Throwable)ois.readObject();
-			} catch (ClassNotFoundException e) {
+			} catch (Exception e) {
 				// 
 			}
 		}