8263565: NPE was thrown when sun.jvm.hotspot.rmi.serverNamePrefix was set

YaSuenag · YaSuenag · commit b1a225e11917 · 2021-04-06T00:09:04.000Z
Reviewed-by: cjplummer, amenkov
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/RMIHelper.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/RMIHelper.java
@@ -54,8 +54,7 @@ public class RMIHelper {
             }
         }
 
-        tmp = System.getProperty("sun.jvm.hotspot.rmi.serverNamePrefix");
-        serverNamePrefix = (tmp != null)? serverNamePrefix : "SARemoteDebugger";
+        serverNamePrefix = System.getProperty("sun.jvm.hotspot.rmi.serverNamePrefix", "SARemoteDebugger");
     }
 
     public static void rebind(String uniqueID, Remote object) throws DebuggerException {

Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,7 @@ public class RMIHelper {`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`
`57`		`- tmp = System.getProperty("sun.jvm.hotspot.rmi.serverNamePrefix");`
`58`		`- serverNamePrefix = (tmp != null)? serverNamePrefix : "SARemoteDebugger";`
	`57`	`+ serverNamePrefix = System.getProperty("sun.jvm.hotspot.rmi.serverNamePrefix", "SARemoteDebugger");`
`59`	`58`	`}`
`60`	`59`
`61`	`60`	`public static void rebind(String uniqueID, Remote object) throws DebuggerException {`