8284567: Collapse identical catch branches in java.base

Reviewed-by: darcy, iris, wetmore
2022-04-11 09:32:24 +00:00 · 2022-04-11 09:32:24 +00:00 · f4edb59a6e
commit f4edb59a6e
parent 40ddb7558c
17 changed files with 46 additions and 106 deletions
--- a/src/java.base/aix/classes/sun/nio/ch/AixPollPort.java
+++ b/src/java.base/aix/classes/sun/nio/ch/AixPollPort.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
 * Copyright (c) 2012 SAP SE. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
@ -453,10 +453,9 @@ final class AixPollPort
                    // process event
                    try {
                        ev.channel().onEvent(ev.events(), isPooledThread);
-                    } catch (Error x) {
-                        replaceMe = true; throw x;
-                    } catch (RuntimeException x) {
-                        replaceMe = true; throw x;
+                    } catch (Error | RuntimeException x) {
+                        replaceMe = true;
+                        throw x;
                    }
                }
            } finally {
--- a/src/java.base/linux/classes/jdk/internal/platform/CgroupSubsystemController.java
+++ b/src/java.base/linux/classes/jdk/internal/platform/CgroupSubsystemController.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Red Hat Inc.
+ * Copyright (c) 2020, 2022, Red Hat Inc.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -170,9 +170,7 @@ public interface CgroupSubsystemController {
                                           .findFirst();

            return result.isPresent() ? Long.parseLong(result.get()) : defaultRetval;
-        } catch (UncheckedIOException e) {
-            return defaultRetval;
-        } catch (IOException e) {
+        } catch (UncheckedIOException | IOException e) {
            return defaultRetval;
        }
    }
--- a/src/java.base/linux/classes/jdk/internal/platform/CgroupSubsystemFactory.java
+++ b/src/java.base/linux/classes/jdk/internal/platform/CgroupSubsystemFactory.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Red Hat Inc.
+ * Copyright (c) 2020, 2022, Red Hat Inc.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -82,9 +82,7 @@ public class CgroupSubsystemFactory {
        Optional<CgroupTypeResult> optResult = null;
        try {
            optResult = determineType("/proc/self/mountinfo", "/proc/cgroups", "/proc/self/cgroup");
-        } catch (IOException e) {
-            return null;
-        } catch (UncheckedIOException e) {
+        } catch (IOException | UncheckedIOException e) {
            return null;
        }

--- a/src/java.base/linux/classes/jdk/internal/platform/cgroupv2/CgroupV2Subsystem.java
+++ b/src/java.base/linux/classes/jdk/internal/platform/cgroupv2/CgroupV2Subsystem.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Red Hat Inc.
+ * Copyright (c) 2020, 2022, Red Hat Inc.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -332,9 +332,7 @@ public class CgroupV2Subsystem implements CgroupSubsystem {
            return CgroupUtil.readFilePrivileged(Paths.get(unified.path(), "io.stat"))
                                .map(mapFunc)
                                .collect(Collectors.summingLong(e -> e));
-        } catch (UncheckedIOException e) {
-            return CgroupSubsystem.LONG_RETVAL_UNLIMITED;
-        } catch (IOException e) {
+        } catch (UncheckedIOException | IOException e) {
            return CgroupSubsystem.LONG_RETVAL_UNLIMITED;
        }
    }
--- a/src/java.base/linux/classes/sun/nio/ch/EPollPort.java
+++ b/src/java.base/linux/classes/sun/nio/ch/EPollPort.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, 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
@ -34,7 +34,6 @@ import java.util.concurrent.atomic.AtomicInteger;
 import static sun.nio.ch.EPoll.EPOLLIN;
 import static sun.nio.ch.EPoll.EPOLLONESHOT;
 import static sun.nio.ch.EPoll.EPOLL_CTL_ADD;
-import static sun.nio.ch.EPoll.EPOLL_CTL_DEL;
 import static sun.nio.ch.EPoll.EPOLL_CTL_MOD;


@ -304,10 +303,9 @@ final class EPollPort
                    // process event
                    try {
                        ev.channel().onEvent(ev.events(), isPooledThread);
-                    } catch (Error x) {
-                        replaceMe = true; throw x;
-                    } catch (RuntimeException x) {
-                        replaceMe = true; throw x;
+                    } catch (Error | RuntimeException x) {
+                        replaceMe = true;
+                        throw x;
                    }
                }
            } finally {
--- a/src/java.base/macosx/classes/sun/nio/ch/KQueuePort.java
+++ b/src/java.base/macosx/classes/sun/nio/ch/KQueuePort.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022, 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
@ -310,10 +310,9 @@ final class KQueuePort
                    // process event
                    try {
                        ev.channel().onEvent(ev.events(), isPooledThread);
-                    } catch (Error x) {
-                        replaceMe = true; throw x;
-                    } catch (RuntimeException x) {
-                        replaceMe = true; throw x;
+                    } catch (Error | RuntimeException x) {
+                        replaceMe = true;
+                        throw x;
                    }
                }
            } finally {
--- a/src/java.base/share/classes/java/net/URI.java
+++ b/src/java.base/share/classes/java/net/URI.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2022, 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
@ -44,9 +44,6 @@ import jdk.internal.access.JavaNetUriAccess;
 import jdk.internal.access.SharedSecrets;
 import sun.nio.cs.UTF_8;

-import java.lang.Character;             // for javadoc
-import java.lang.NullPointerException;  // for javadoc
-
 /**
 * Represents a Uniform Resource Identifier (URI) reference.
 *
@ -3451,9 +3448,7 @@ public final class URI

            try {
                p = scanIPv4Address(start, n, false);
-            } catch (URISyntaxException x) {
-                return -1;
-            } catch (NumberFormatException nfe) {
+            } catch (URISyntaxException | NumberFormatException x) {
                return -1;
            }

--- a/src/java.base/share/classes/java/nio/channels/spi/AsynchronousChannelProvider.java
+++ b/src/java.base/share/classes/java/nio/channels/spi/AsynchronousChannelProvider.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2022, 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
@ -100,13 +100,8 @@ public abstract class AsynchronousChannelProvider {
                Object tmp = Class.forName(cn, true,
                                           ClassLoader.getSystemClassLoader()).newInstance();
                return (AsynchronousChannelProvider)tmp;
-            } catch (ClassNotFoundException x) {
-                throw new ServiceConfigurationError(null, x);
-            } catch (IllegalAccessException x) {
-                throw new ServiceConfigurationError(null, x);
-            } catch (InstantiationException x) {
-                throw new ServiceConfigurationError(null, x);
-            } catch (SecurityException x) {
+            } catch (ClassNotFoundException | SecurityException |
+                     InstantiationException | IllegalAccessException x) {
                throw new ServiceConfigurationError(null, x);
            }
        }
--- a/src/java.base/share/classes/java/util/AbstractMap.java
+++ b/src/java.base/share/classes/java/util/AbstractMap.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, 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
@ -24,7 +24,6 @@
 */

 package java.util;
-import java.util.Map.Entry;

 /**
 * This class provides a skeletal implementation of the {@code Map}
@ -493,9 +492,7 @@ public abstract class AbstractMap<K,V> implements Map<K,V> {
                        return false;
                }
            }
-        } catch (ClassCastException unused) {
-            return false;
-        } catch (NullPointerException unused) {
+        } catch (ClassCastException | NullPointerException unused) {
            return false;
        }

--- a/src/java.base/share/classes/java/util/Hashtable.java
+++ b/src/java.base/share/classes/java/util/Hashtable.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2022, 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
@ -831,9 +831,7 @@ public class Hashtable<K,V>
                        return false;
                }
            }
-        } catch (ClassCastException unused)   {
-            return false;
-        } catch (NullPointerException unused) {
+        } catch (ClassCastException | NullPointerException unused) {
            return false;
        }

--- a/src/java.base/share/classes/jdk/internal/loader/URLClassPath.java
+++ b/src/java.base/share/classes/jdk/internal/loader/URLClassPath.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, 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
@ -866,12 +866,7 @@ public class URLClassPath {
                if (check) {
                    URLClassPath.check(url);
                }
-            } catch (MalformedURLException e) {
-                return null;
-                // throw new IllegalArgumentException("name");
-            } catch (IOException e) {
-                return null;
-            } catch (@SuppressWarnings("removal") AccessControlException e) {
+            } catch (@SuppressWarnings("removal") AccessControlException | IOException e) {
                return null;
            }

@ -1026,9 +1021,7 @@ public class URLClassPath {
                            /* put it in the global hashtable */
                            lmap.put(urlNoFragString, newLoader);
                        }
-                    } catch (PrivilegedActionException pae) {
-                        continue;
-                    } catch (MalformedURLException e) {
+                    } catch (PrivilegedActionException | MalformedURLException e) {
                        continue;
                    }

--- a/src/java.base/share/classes/jdk/internal/util/xml/impl/ParserSAX.java
+++ b/src/java.base/share/classes/jdk/internal/util/xml/impl/ParserSAX.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022, 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
@ -341,12 +341,8 @@ final class ParserSAX
        mPh = PH_BEFORE_DOC;  // before parsing
        try {
            setinp(is);
-        } catch (SAXException saxe) {
-            throw saxe;
-        } catch (IOException ioe) {
-            throw ioe;
-        } catch (RuntimeException rte) {
-            throw rte;
+        } catch (SAXException | IOException | RuntimeException e) {
+            throw e;
        } catch (Exception e) {
            panic(e.toString());
        }
@ -529,12 +525,8 @@ final class ParserSAX
            } while (mPh == PH_DOCELM_MISC);
            mPh = PH_AFTER_DOC;  // parsing is completed

-        } catch (SAXException saxe) {
-            throw saxe;
-        } catch (IOException ioe) {
-            throw ioe;
-        } catch (RuntimeException rte) {
-            throw rte;
+        } catch (SAXException | IOException | RuntimeException e) {
+            throw e;
        } catch (Exception e) {
            panic(e.toString());
        } finally {
--- a/src/java.base/share/classes/sun/net/NetProperties.java
+++ b/src/java.base/share/classes/sun/net/NetProperties.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2022, 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
@ -92,8 +92,7 @@ public class NetProperties {
        String def = props.getProperty(key);
        try {
            return System.getProperty(key, def);
-        } catch (IllegalArgumentException e) {
-        } catch (NullPointerException e) {
+        } catch (IllegalArgumentException | NullPointerException e) {
        }
        return null;
    }
@ -115,8 +114,7 @@ public class NetProperties {

        try {
            val = System.getProperty(key, props.getProperty(key));
-        } catch (IllegalArgumentException e) {
-        } catch (NullPointerException e) {
+        } catch (IllegalArgumentException | NullPointerException e) {
        }

        if (val != null) {
@ -144,8 +142,7 @@ public class NetProperties {

        try {
            val = System.getProperty(key, props.getProperty(key));
-        } catch (IllegalArgumentException e) {
-        } catch (NullPointerException e) {
+        } catch (IllegalArgumentException | NullPointerException e) {
        }

        if (val != null) {
--- a/src/java.base/share/classes/sun/net/www/protocol/ftp/FtpURLConnection.java
+++ b/src/java.base/share/classes/sun/net/www/protocol/ftp/FtpURLConnection.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2022, 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
@ -510,17 +510,7 @@ public class FtpURLConnection extends URLConnection {
                is = new FtpInputStream(ftp, ftp.list(null));
                msgh.add("content-type", "text/plain");
                msgh.add("access-type", "directory");
-            } catch (IOException ex) {
-                FileNotFoundException fnfe = new FileNotFoundException(fullpath);
-                if (ftp != null) {
-                    try {
-                        ftp.close();
-                    } catch (IOException ioe) {
-                        fnfe.addSuppressed(ioe);
-                    }
-                }
-                throw fnfe;
-            } catch (FtpProtocolException ex2) {
+            } catch (IOException | FtpProtocolException ex) {
                FileNotFoundException fnfe = new FileNotFoundException(fullpath);
                if (ftp != null) {
                    try {
--- a/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
+++ b/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
@ -1465,9 +1465,6 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
                }
                return poster;
            }
-        } catch (RuntimeException e) {
-            disconnectInternal();
-            throw e;
        } catch (ProtocolException e) {
            // Save the response code which may have been set while enforcing
            // the 100-continue. disconnectInternal() forces it to -1
@ -1475,7 +1472,7 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
            disconnectInternal();
            responseCode = i;
            throw e;
-        } catch (IOException e) {
+        } catch (RuntimeException | IOException e) {
            disconnectInternal();
            throw e;
        }
--- a/src/java.base/unix/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java
+++ b/src/java.base/unix/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2022, 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
@ -243,9 +243,7 @@ public class NTLMAuthentication extends AuthenticationInfo {
            }
            conn.setAuthenticationProperty(getHeaderName(), response);
            return true;
-        } catch (IOException e) {
-            return false;
-        } catch (GeneralSecurityException e) {
+        } catch (IOException | GeneralSecurityException e) {
            return false;
        }
    }
--- a/src/java.base/windows/classes/sun/nio/fs/WindowsFileAttributeViews.java
+++ b/src/java.base/windows/classes/sun/nio/fs/WindowsFileAttributeViews.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, 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
@ -110,9 +110,7 @@ class WindowsFileAttributeViews {
                            // retry succeeded
                            x = null;
                        }
-                    } catch (SecurityException ignore) {
-                    } catch (WindowsException ignore) {
-                    } catch (IOException ignore) {
+                    } catch (SecurityException | WindowsException | IOException ignore) {
                        // ignore exceptions to let original exception be thrown
                    }
                }