Collapse multiple identical catch clauses into one.

Author: garydgregory

src/main/java/org/apache/commons/codec/digest/HmacUtils.java

@@ -236,9 +236,7 @@ public static Mac getInitializedMac(final String algorithm, final byte[] key) {
             final Mac mac = Mac.getInstance(algorithm);
             mac.init(keySpec);
             return mac;
-        } catch (final NoSuchAlgorithmException e) {
-            throw new IllegalArgumentException(e);
-        } catch (final InvalidKeyException e) {
+        } catch (final NoSuchAlgorithmException | InvalidKeyException e) {
             throw new IllegalArgumentException(e);
         }
     }

src/test/java/org/apache/commons/codec/binary/HexTest.java

@@ -105,14 +105,7 @@ private boolean charsetSanityCheck(final String name) {
                 log("FAILED charsetSanityCheck=Interesting Java charset oddity: Roundtrip failed for " + name);
             }
             return equals;
-        } catch (final UnsupportedEncodingException e) {
-            // Should NEVER happen since we are getting the name from the Charset class.
-            if (LOG) {
-                log("FAILED charsetSanityCheck=" + name + ", e=" + e);
-                log(e);
-            }
-            return false;
-        } catch (final UnsupportedOperationException e) {
+        } catch (final UnsupportedEncodingException | UnsupportedOperationException e) {
             // Caught here with:
             // x-JISAutoDetect on Windows XP and Java Sun 1.4.2_19 x86 32-bits
             // x-JISAutoDetect on Windows XP and Java Sun 1.5.0_17 x86 32-bits