From f001b9eb53066b761cb4169ed5e1806eb1d42f2c Mon Sep 17 00:00:00 2001
From: Darryl Mocek <dmocek@openjdk.org>
Date: Thu, 2 Aug 2012 18:12:18 -0700
Subject: [PATCH] 7187876: ClassCastException in TCPTransport.executeAcceptLoop

Reviewed-by: dholmes, smarks
---
 .../share/classes/sun/rmi/transport/tcp/TCPTransport.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java b/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java
index e2b9841c11b..8b523df9c38 100644
--- a/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java
+++ b/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java
@@ -28,6 +28,7 @@ import java.lang.ref.Reference;
 import java.lang.ref.SoftReference;
 import java.lang.ref.WeakReference;
 import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.UndeclaredThrowableException;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
@@ -462,8 +463,10 @@ public class TCPTransport extends Transport {
                             return;
                         }
                         // continue loop
-                    } else {
+                    } else if (t instanceof Error) {
                         throw (Error) t;
+                    } else {
+                        throw new UndeclaredThrowableException(t);
                     }
                 }
             }