diff -r 5de73d2d685e src/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java
--- a/src/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java	Mon Dec 01 13:38:26 2008 -0800
+++ b/src/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java	Sun Jan 18 15:33:38 2009 +1100
@@ -44,6 +44,7 @@
 
 package com.sun.corba.se.impl.io;
 
+import org.omg.CORBA.portable.RemarshalException;
 import org.omg.CORBA.portable.OutputStream;
 
 import java.security.AccessController ;
@@ -230,6 +231,8 @@
             } catch (IOException ee) {
                 if (abortIOException == null)
                     abortIOException = ee;
+            } catch (RemarshalException re) {
+                bridge.throwException( re );
             } finally {
                 /* Restore state of previous call incase this is a nested call */
                 streamFormatVersion = oldStreamFormatVersion;
@@ -642,7 +645,7 @@
      */
     @TraceValueHandler
     @ValueHandlerWrite
-    private void outputObject(final Object obj) throws IOException{
+    private void outputObject(final Object obj) throws IOException, RemarshalException {
         if (valueHandlerDebug())
             dputil.enter("outputObject", "obj", obj ) ;
 
@@ -738,7 +741,7 @@
     @TraceValueHandler
     @ValueHandlerWrite
     private void invokeObjectWriter(ObjectStreamClass osc, Object obj)
-	throws IOException
+	throws IOException, RemarshalException
     {
         if (valueHandlerDebug())
             dputil.enter("invokeObjectWriter", "obj", obj ) ;
@@ -764,6 +767,8 @@
                     throw (IOException)t;
                 else if (t instanceof RuntimeException)
                     throw (RuntimeException) t;
+                else if (t instanceof RemarshalException)
+                    throw (RemarshalException) t;
                 else if (t instanceof Error)
                     throw (Error) t;
                 else
diff -r 5de73d2d685e src/share/classes/com/sun/corba/se/spi/logging/data/ORBUtil.mc
--- a/src/share/classes/com/sun/corba/se/spi/logging/data/ORBUtil.mc	Mon Dec 01 13:38:26 2008 -0800
+++ b/src/share/classes/com/sun/corba/se/spi/logging/data/ORBUtil.mc	Sun Jan 18 15:33:38 2009 +1100
@@ -276,9 +276,9 @@
 	    (TRANSPORT_WRITE_TIMEOUT_EXCEEDED
 	     25 WARNING "Write of message exceeded TCP timeout : max wait time = {0} ms, total time spent blocked, waiting to write = {1} ms.")
             (EXCEPTION_WHEN_READING_WITH_TEMPORARY_SELECTOR
-	     26 SEVERE "Unexpected exception when reading with a temporary selector: bytes read = {0}, bytes requested = {1}, time spent waiting = {2} ms, max time to wait = {4}.")
+	     26 SEVERE "Unexpected exception when reading with a temporary selector: bytes read = {0}, bytes requested = {1}, time spent waiting = {2} ms, max time to wait = {3}.")
             (EXCEPTION_WHEN_WRITING_WITH_TEMPORARY_SELECTOR
-	     27 SEVERE "Unexpected exception when writing with a temporary selector:  bytes written = {0}, total bytes requested to write = {1}, time spent waiting = {2} ms, max time to wait = {4}.")
+	     27 SEVERE "Unexpected exception when writing with a temporary selector:  bytes written = {0}, total bytes requested to write = {1}, time spent waiting = {2} ms, max time to wait = {3}.")
             (THROWABLE_IN_DO_OPTIMIZED_READ_STRATEGY
 	     28 FINE "Throwable received in doOptimizedReadStrategy")
 	    (BLOCKING_READ_TIMEOUT