From 75ffcef61d8414228bbf1292bbc269b70a1e0d07 Mon Sep 17 00:00:00 2001
From: Stuart Marks <smarks@openjdk.org>
Date: Tue, 18 Nov 2014 17:02:50 -0800
Subject: [PATCH] 8062807: Exporting RMI objects fails when run under
 restrictive SecurityManager

Reviewed-by: dfuchs, skoivu, igerasim, msheppar
---
 .../sun/rmi/transport/tcp/TCPTransport.java   | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPTransport.java b/jdk/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPTransport.java
index 159aa65f5ae..1caa362803a 100644
--- a/jdk/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPTransport.java
+++ b/jdk/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPTransport.java
@@ -668,19 +668,19 @@ public class TCPTransport extends Transport {
         }
 
         public void run() {
-            AccessController.doPrivileged((PrivilegedAction<Void>)() -> {
-                    Thread t = Thread.currentThread();
-                    String name = t.getName();
-                    try {
-                        t.setName("RMI TCP Connection(" +
-                                  connectionCount.incrementAndGet() +
-                                  ")-" + remoteHost);
-                        run0();
-                    } finally {
-                        t.setName(name);
-                    }
+            Thread t = Thread.currentThread();
+            String name = t.getName();
+            try {
+                t.setName("RMI TCP Connection(" +
+                          connectionCount.incrementAndGet() +
+                          ")-" + remoteHost);
+                AccessController.doPrivileged((PrivilegedAction<Void>)() -> {
+                    run0();
                     return null;
                 }, NOPERMS_ACC);
+            } finally {
+                t.setName(name);
+            }
         }
 
         private void run0() {