Author: shawkins Date: 2010-09-24 15:23:01 -0400 (Fri, 24 Sep 2010) New Revision: 2606 Modified: trunk/client/src/main/java/org/teiid/client/BatchSerializer.java trunk/client/src/test/java/org/teiid/client/TestBatchSerializer.java trunk/runtime/ trunk/runtime/src/main/java/org/teiid/transport/SocketClientInstance.java Log: forward merging 7.1.1 Modified: trunk/client/src/main/java/org/teiid/client/BatchSerializer.java =================================================================== --- trunk/client/src/main/java/org/teiid/client/BatchSerializer.java 2010-09-24 19:12:34 UTC (rev 2605) +++ trunk/client/src/main/java/org/teiid/client/BatchSerializer.java 2010-09-24 19:23:01 UTC (rev 2606) @@ -34,6 +34,7 @@ import java.util.List; import java.util.Map; +import org.teiid.core.TeiidRuntimeException; import org.teiid.core.types.DataTypeManager; import org.teiid.jdbc.JDBCPlugin; @@ -380,7 +381,7 @@ break objectSearch; } } - throw new IOException(JDBCPlugin.Util.getString("BatchSerializer.datatype_mismatch", new Object[] {types[i], new Integer(i), objectClass})); //$NON-NLS-1$ + throw new TeiidRuntimeException(JDBCPlugin.Util.getString("BatchSerializer.datatype_mismatch", new Object[] {types[i], new Integer(i), objectClass})); //$NON-NLS-1$ } } } Modified: trunk/client/src/test/java/org/teiid/client/TestBatchSerializer.java =================================================================== --- trunk/client/src/test/java/org/teiid/client/TestBatchSerializer.java 2010-09-24 19:12:34 UTC (rev 2605) +++ trunk/client/src/test/java/org/teiid/client/TestBatchSerializer.java 2010-09-24 19:23:01 UTC (rev 2606) @@ -195,7 +195,7 @@ public void testSerializeDatatypeMismatch() throws Exception { try { helpTestSerialization(new String[] {DataTypeManager.DefaultDataTypes.DOUBLE}, new List[] {Arrays.asList(new Object[] {"Hello!"})}); //$NON-NLS-1$ - } catch (IOException e) { + } catch (RuntimeException e) { assertEquals("The modeled datatype double for column 0 doesn't match the runtime type \"java.lang.String\". Please ensure that the column's modeled datatype matches the expected data.", e.getMessage()); //$NON-NLS-1$ } } Property changes on: trunk/runtime ___________________________________________________________________ Name: svn:mergeinfo - Modified: trunk/runtime/src/main/java/org/teiid/transport/SocketClientInstance.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/transport/SocketClientInstance.java 2010-09-24 19:12:34 UTC (rev 2605) +++ trunk/runtime/src/main/java/org/teiid/transport/SocketClientInstance.java 2010-09-24 19:23:01 UTC (rev 2606) @@ -22,10 +22,10 @@ package org.teiid.transport; +import java.io.IOException; import java.io.Serializable; import java.net.InetSocketAddress; import java.net.SocketAddress; -import java.net.SocketException; import org.teiid.client.security.ILogon; import org.teiid.core.crypto.CryptoException; @@ -89,7 +89,7 @@ } public void exceptionOccurred(Throwable t) { - LogManager.log(t instanceof SocketException?MessageLevel.DETAIL:MessageLevel.ERROR, LogConstants.CTX_TRANSPORT, t, "Unhandled exception, closing client instance"); //$NON-NLS-1$ + LogManager.log(t instanceof IOException?MessageLevel.DETAIL:MessageLevel.ERROR, LogConstants.CTX_TRANSPORT, t, "Unhandled exception, closing client instance"); //$NON-NLS-1$ } public void onConnection() throws CommunicationException {