8274757: Cleanup unnecessary calls to Throwable.initCause() in java.management module

turbanoff · Serguei Spitsyn · commit 1c45c8a08287 · 2021-11-16T11:19:01.000Z
Reviewed-by: dfuchs, sspitsyn
diff --git a/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java b/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java
@@ -1648,8 +1648,7 @@ public ClassLoader run() throws Exception {
      */
     private static IOException newIOException(String message,
                                               Throwable cause) {
-        final IOException x = new IOException(message);
-        return EnvHelp.initCause(x,cause);
+        return new IOException(message, cause);
     }
 
     /**
diff --git a/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnector.java b/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnector.java
@@ -367,7 +367,7 @@ public synchronized void connect(Map<String,?> environment)
         } catch (NamingException e) {
             final String msg = "Failed to retrieve RMIServer stub: " + e;
             if (tracing) logger.trace("connect",idstr + " " + msg);
-            throw EnvHelp.initCause(new IOException(msg),e);
+            throw new IOException(msg, e);
         }
     }
 
@@ -543,9 +543,7 @@ private synchronized void close(boolean intern) throws IOException {
                 throw (IOException) closeException;
             if (closeException instanceof RuntimeException)
                 throw (RuntimeException) closeException;
-            final IOException x =
-                    new IOException("Failed to close: " + closeException);
-            throw EnvHelp.initCause(x,closeException);
+            throw new IOException("Failed to close: " + closeException, closeException);
         }
     }
 
diff --git a/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnectorServer.java b/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnectorServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -420,8 +420,7 @@ public synchronized void start() throws IOException {
                 try {
                     mbsf = new MBeanServerFileAccessController(accessFile);
                 } catch (IOException e) {
-                    throw EnvHelp.initCause(
-                        new IllegalArgumentException(e.getMessage()), e);
+                    throw new IllegalArgumentException(e.getMessage(), e);
                 }
                 // Set the MBeanServerForwarder
                 //
@@ -434,9 +433,7 @@ public synchronized void start() throws IOException {
             defaultClassLoader = EnvHelp.resolveServerClassLoader(
                     attributes, getMBeanServer());
         } catch (InstanceNotFoundException infc) {
-            IllegalArgumentException x = new
-                IllegalArgumentException("ClassLoader not found: "+infc);
-            throw EnvHelp.initCause(x,infc);
+            throw new IllegalArgumentException("ClassLoader not found: " + infc, infc);
         }
 
         if (tracing) logger.trace("start", "setting RMIServer object");
@@ -831,8 +828,7 @@ private static String byteArrayToBase64(byte[] a) {
      */
     private static IOException newIOException(String message,
                                               Throwable cause) {
-        final IOException x = new IOException(message);
-        return EnvHelp.initCause(x,cause);
+        return new IOException(message, cause);
     }
 
 
diff --git a/src/java.management/share/classes/com/sun/jmx/interceptor/DefaultMBeanServerInterceptor.java b/src/java.management/share/classes/com/sun/jmx/interceptor/DefaultMBeanServerInterceptor.java
@@ -38,7 +38,6 @@
 import com.sun.jmx.mbeanserver.Util;
 import com.sun.jmx.remote.util.EnvHelp;
 
-import java.io.ObjectInputStream;
 import java.lang.ref.WeakReference;
 import java.security.AccessControlContext;
 import java.security.AccessController;
@@ -80,7 +79,6 @@
 import javax.management.NotificationListener;
 import javax.management.ObjectInstance;
 import javax.management.ObjectName;
-import javax.management.OperationsException;
 import javax.management.QueryEval;
 import javax.management.QueryExp;
 import javax.management.ReflectionException;
@@ -208,8 +206,7 @@ public ObjectInstance createMBean(String className, ObjectName name,
         } catch (InstanceNotFoundException e) {
             /* Can only happen if loaderName doesn't exist, but we just
                passed null, so we shouldn't get this exception.  */
-            throw EnvHelp.initCause(
-                new IllegalArgumentException("Unexpected exception: " + e), e);
+            throw new IllegalArgumentException("Unexpected exception: " + e, e);
         }
     }
 
diff --git a/src/java.management/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java b/src/java.management/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java
@@ -610,11 +610,9 @@ private void createListeners() {
             logger.debug("createListeners", "added creationListener");
         } catch (Exception e) {
             final String msg = "Can't add listener to MBean server delegate: ";
-            RuntimeException re = new IllegalArgumentException(msg + e);
-            EnvHelp.initCause(re, e);
             logger.fine("createListeners", msg + e);
             logger.debug("createListeners", e);
-            throw re;
+            throw new IllegalArgumentException(msg + e, e);
         }
 
         /* Spec doesn't say whether Set returned by QueryNames can be modified
diff --git a/src/java.management/share/classes/com/sun/jmx/remote/internal/ClientNotifForwarder.java b/src/java.management/share/classes/com/sun/jmx/remote/internal/ClientNotifForwarder.java
@@ -51,7 +51,6 @@
 
 import com.sun.jmx.remote.util.ClassLogger;
 import com.sun.jmx.remote.util.EnvHelp;
-import java.lang.reflect.UndeclaredThrowableException;
 import java.util.concurrent.RejectedExecutionException;
 
 
@@ -340,9 +339,7 @@ public synchronized void postReconnection(ClientListenerInfo[] listenerInfos)
             try {
                 wait();
             } catch (InterruptedException ire) {
-                IOException ioe = new IOException(ire.toString());
-                EnvHelp.initCause(ioe, ire);
-                throw ioe;
+                throw new IOException(ire.toString(), ire);
             }
         }
 
@@ -381,9 +378,7 @@ public synchronized void postReconnection(ClientListenerInfo[] listenerInfos)
                   try {
                       wait();
                   } catch (InterruptedException ire) {
-                      IOException ioe = new IOException(ire.toString());
-                      EnvHelp.initCause(ioe, ire);
-                      throw ioe;
+                      throw new IOException(ire.toString(), ire);
                   }
               }
 
@@ -821,10 +816,7 @@ private synchronized void init(boolean reconnected) throws IOException {
                 try {
                     wait();
                 } catch (InterruptedException ire) {
-                    IOException ioe = new IOException(ire.toString());
-                    EnvHelp.initCause(ioe, ire);
-
-                    throw ioe;
+                    throw new IOException(ire.toString(), ire);
                 }
             }
 
@@ -901,10 +893,7 @@ private synchronized void beforeRemove() throws IOException {
             try {
                 wait();
             } catch (InterruptedException ire) {
-                IOException ioe = new IOException(ire.toString());
-                EnvHelp.initCause(ioe, ire);
-
-                throw ioe;
+                throw new IOException(ire.toString(), ire);
             }
         }
 
diff --git a/src/java.management/share/classes/com/sun/jmx/remote/internal/ServerNotifForwarder.java b/src/java.management/share/classes/com/sun/jmx/remote/internal/ServerNotifForwarder.java
@@ -121,9 +121,7 @@ public Boolean run() throws InstanceNotFoundException {
                                             name.getKeyPropertyList());
             } catch (MalformedObjectNameException mfoe) {
                 // impossible, but...
-                IOException ioe = new IOException(mfoe.getMessage());
-                ioe.initCause(mfoe);
-                throw ioe;
+                throw new IOException(mfoe.getMessage(), mfoe);
             }
         }
 
diff --git a/src/java.management/share/classes/com/sun/jmx/remote/security/JMXPluggableAuthenticator.java b/src/java.management/share/classes/com/sun/jmx/remote/security/JMXPluggableAuthenticator.java
@@ -44,7 +44,6 @@
 import javax.security.auth.login.LoginException;
 import javax.security.auth.spi.LoginModule;
 import com.sun.jmx.remote.util.ClassLogger;
-import com.sun.jmx.remote.util.EnvHelp;
 
 /**
  * <p>This class represents a
@@ -228,9 +227,7 @@ private static void authenticationFailure(String method,
             se = (SecurityException) exception;
         } else {
             msg = "Authentication failed! " + exception.getMessage();
-            final SecurityException e = new SecurityException(msg);
-            EnvHelp.initCause(e, exception);
-            se = e;
+            se = new SecurityException(msg, exception);
         }
         logException(method, msg, se);
         throw se;
diff --git a/src/java.management/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java b/src/java.management/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,8 +27,6 @@
 package javax.management.openmbean;
 
 
-// java import
-//
 import java.lang.reflect.Array;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
@@ -44,7 +42,6 @@
 import javax.management.DescriptorRead;
 import javax.management.ImmutableDescriptor;
 import javax.management.MBeanAttributeInfo;
-import com.sun.jmx.remote.util.EnvHelp;
 import sun.reflect.misc.MethodUtil;
 import sun.reflect.misc.ReflectUtil;
 
@@ -626,7 +623,7 @@ static <T> T valueFrom(Descriptor d, String name, OpenType<T> openType) {
             final String msg =
                 "Cannot convert descriptor field " + name + "  to " +
                 openType.getTypeName();
-            throw EnvHelp.initCause(new IllegalArgumentException(msg), e);
+            throw new IllegalArgumentException(msg, e);
         }
     }
 
diff --git a/src/java.management/share/classes/javax/management/remote/JMXConnectorFactory.java b/src/java.management/share/classes/javax/management/remote/JMXConnectorFactory.java
@@ -619,8 +619,7 @@ public boolean test(Provider<P> sp) {
                             if (e instanceof IOException) {
                                 exception = (IOException) e;
                             } else {
-                                exception = EnvHelp.initCause(
-                                    new IOException(e.getMessage()), e);
+                                exception = new IOException(e.getMessage(), e);
                             }
                         }
                     }

Original file line number	Diff line number	Diff line change
`@@ -1648,8 +1648,7 @@ public ClassLoader run() throws Exception {`
`1648`	`1648`	`*/`
`1649`	`1649`	`private static IOException newIOException(String message,`
`1650`	`1650`	`Throwable cause) {`
`1651`		`- final IOException x = new IOException(message);`
`1652`		`- return EnvHelp.initCause(x,cause);`
	`1651`	`+ return new IOException(message, cause);`
`1653`	`1652`	`}`
`1654`	`1653`
`1655`	`1654`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -367,7 +367,7 @@ public synchronized void connect(Map<String,?> environment)`
`367`	`367`	`} catch (NamingException e) {`
`368`	`368`	`final String msg = "Failed to retrieve RMIServer stub: " + e;`
`369`	`369`	`if (tracing) logger.trace("connect",idstr + " " + msg);`
`370`		`- throw EnvHelp.initCause(new IOException(msg),e);`
	`370`	`+ throw new IOException(msg, e);`
`371`	`371`	`}`
`372`	`372`	`}`
`373`	`373`
`@@ -543,9 +543,7 @@ private synchronized void close(boolean intern) throws IOException {`
`543`	`543`	`throw (IOException) closeException;`
`544`	`544`	`if (closeException instanceof RuntimeException)`
`545`	`545`	`throw (RuntimeException) closeException;`
`546`		`- final IOException x =`
`547`		`- new IOException("Failed to close: " + closeException);`
`548`		`- throw EnvHelp.initCause(x,closeException);`
	`546`	`+ throw new IOException("Failed to close: " + closeException, closeException);`
`549`	`547`	`}`
`550`	`548`	`}`
`551`	`549`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,6 @@`
`51`	`51`
`52`	`52`	`import com.sun.jmx.remote.util.ClassLogger;`
`53`	`53`	`import com.sun.jmx.remote.util.EnvHelp;`
`54`		`-import java.lang.reflect.UndeclaredThrowableException;`
`55`	`54`	`import java.util.concurrent.RejectedExecutionException;`
`56`	`55`
`57`	`56`
`@@ -340,9 +339,7 @@ public synchronized void postReconnection(ClientListenerInfo[] listenerInfos)`
`340`	`339`	`try {`
`341`	`340`	`wait();`
`342`	`341`	`} catch (InterruptedException ire) {`
`343`		`- IOException ioe = new IOException(ire.toString());`
`344`		`- EnvHelp.initCause(ioe, ire);`
`345`		`- throw ioe;`
	`342`	`+ throw new IOException(ire.toString(), ire);`
`346`	`343`	`}`
`347`	`344`	`}`
`348`	`345`
`@@ -381,9 +378,7 @@ public synchronized void postReconnection(ClientListenerInfo[] listenerInfos)`
`381`	`378`	`try {`
`382`	`379`	`wait();`
`383`	`380`	`} catch (InterruptedException ire) {`
`384`		`- IOException ioe = new IOException(ire.toString());`
`385`		`- EnvHelp.initCause(ioe, ire);`
`386`		`- throw ioe;`
	`381`	`+ throw new IOException(ire.toString(), ire);`
`387`	`382`	`}`
`388`	`383`	`}`
`389`	`384`
`@@ -821,10 +816,7 @@ private synchronized void init(boolean reconnected) throws IOException {`
`821`	`816`	`try {`
`822`	`817`	`wait();`
`823`	`818`	`} catch (InterruptedException ire) {`
`824`		`- IOException ioe = new IOException(ire.toString());`
`825`		`- EnvHelp.initCause(ioe, ire);`
`826`		`-`
`827`		`- throw ioe;`
	`819`	`+ throw new IOException(ire.toString(), ire);`
`828`	`820`	`}`
`829`	`821`	`}`
`830`	`822`
`@@ -901,10 +893,7 @@ private synchronized void beforeRemove() throws IOException {`
`901`	`893`	`try {`
`902`	`894`	`wait();`
`903`	`895`	`} catch (InterruptedException ire) {`
`904`		`- IOException ioe = new IOException(ire.toString());`
`905`		`- EnvHelp.initCause(ioe, ire);`
`906`		`-`
`907`		`- throw ioe;`
	`896`	`+ throw new IOException(ire.toString(), ire);`
`908`	`897`	`}`
`909`	`898`	`}`
`910`	`899`
Original file line number	Diff line number	Diff line change
`@@ -121,9 +121,7 @@ public Boolean run() throws InstanceNotFoundException {`
`121`	`121`	`name.getKeyPropertyList());`
`122`	`122`	`} catch (MalformedObjectNameException mfoe) {`
`123`	`123`	`// impossible, but...`
`124`		`- IOException ioe = new IOException(mfoe.getMessage());`
`125`		`- ioe.initCause(mfoe);`
`126`		`- throw ioe;`
	`124`	`+ throw new IOException(mfoe.getMessage(), mfoe);`
`127`	`125`	`}`
`128`	`126`	`}`
`129`	`127`
Original file line number	Diff line number	Diff line change
`@@ -619,8 +619,7 @@ public boolean test(Provider<P> sp) {`
`619`	`619`	`if (e instanceof IOException) {`
`620`	`620`	`exception = (IOException) e;`
`621`	`621`	`} else {`
`622`		`- exception = EnvHelp.initCause(`
`623`		`- new IOException(e.getMessage()), e);`
	`622`	`+ exception = new IOException(e.getMessage(), e);`
`624`	`623`	`}`
`625`	`624`	`}`
`626`	`625`	`}`