This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-crypto.git
The following commit(s) were added to refs/heads/master by this push:
new a6f0160 Collapse multiple identical catch clauses into one.
a6f0160 is described below
commit a6f0160275c56bd124725f88c0da34cbac475ca5
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Fri Jan 8 09:28:59 2021 -0500
Collapse multiple identical catch clauses into one.
---
src/main/java/org/apache/commons/crypto/NativeCodeLoader.java | 4 +---
src/main/java/org/apache/commons/crypto/OsInfo.java | 4 +---
src/main/java/org/apache/commons/crypto/cipher/OpenSsl.java | 4 +---
.../java/org/apache/commons/crypto/jna/OpenSsl10XNativeJna.java | 4 +---
.../java/org/apache/commons/crypto/jna/OpenSsl11XNativeJna.java | 4 +---
.../java/org/apache/commons/crypto/random/OpenSslCryptoRandom.java | 4 +---
.../java/org/apache/commons/crypto/stream/CryptoInputStream.java | 6 +-----
7 files changed, 7 insertions(+), 23 deletions(-)
diff --git a/src/main/java/org/apache/commons/crypto/NativeCodeLoader.java
b/src/main/java/org/apache/commons/crypto/NativeCodeLoader.java
index 53e5b3f..64063a3 100644
--- a/src/main/java/org/apache/commons/crypto/NativeCodeLoader.java
+++ b/src/main/java/org/apache/commons/crypto/NativeCodeLoader.java
@@ -289,9 +289,7 @@ final class NativeCodeLoader {
System.loadLibrary(libname);
}
return null; // OK
- } catch (final Exception t) {
- return t;
- } catch (final UnsatisfiedLinkError t) {
+ } catch (final Exception | UnsatisfiedLinkError t) {
return t;
}
}
diff --git a/src/main/java/org/apache/commons/crypto/OsInfo.java
b/src/main/java/org/apache/commons/crypto/OsInfo.java
index d5c1ab0..7d737ef 100644
--- a/src/main/java/org/apache/commons/crypto/OsInfo.java
+++ b/src/main/java/org/apache/commons/crypto/OsInfo.java
@@ -164,9 +164,7 @@ final class OsInfo {
if (exitCode == 0) {
return "armhf";
}
- } catch (final IOException e) { // NOPMD
- // ignored: fall back to "arm" arch (soft-float ABI)
- } catch (final InterruptedException e) { // NOPMD
+ } catch (final IOException | InterruptedException e) { // NOPMD
// ignored: fall back to "arm" arch (soft-float ABI)
}
} else {
diff --git a/src/main/java/org/apache/commons/crypto/cipher/OpenSsl.java
b/src/main/java/org/apache/commons/crypto/cipher/OpenSsl.java
index 787c3e6..c8f3d98 100644
--- a/src/main/java/org/apache/commons/crypto/cipher/OpenSsl.java
+++ b/src/main/java/org/apache/commons/crypto/cipher/OpenSsl.java
@@ -97,9 +97,7 @@ final class OpenSsl {
} else {
loadingFailure = Crypto.getLoadingError();
}
- } catch (final Exception t) {
- loadingFailure = t;
- } catch (final UnsatisfiedLinkError t) {
+ } catch (final Exception | UnsatisfiedLinkError t) {
loadingFailure = t;
} finally {
loadingFailureReason = loadingFailure;
diff --git
a/src/main/java/org/apache/commons/crypto/jna/OpenSsl10XNativeJna.java
b/src/main/java/org/apache/commons/crypto/jna/OpenSsl10XNativeJna.java
index 8c4cf96..bd91a72 100644
--- a/src/main/java/org/apache/commons/crypto/jna/OpenSsl10XNativeJna.java
+++ b/src/main/java/org/apache/commons/crypto/jna/OpenSsl10XNativeJna.java
@@ -41,9 +41,7 @@ class OpenSsl10XNativeJna {
OpenSslJna.debug("Native.register('%s')%n", libName);
Native.register(libName);
ok = true;
- } catch (final Exception e) {
- thrown = e;
- } catch (final UnsatisfiedLinkError e) {
+ } catch (final Exception | UnsatisfiedLinkError e) {
thrown = e;
} finally {
INIT_OK = ok;
diff --git
a/src/main/java/org/apache/commons/crypto/jna/OpenSsl11XNativeJna.java
b/src/main/java/org/apache/commons/crypto/jna/OpenSsl11XNativeJna.java
index 6b1c888..b014a86 100644
--- a/src/main/java/org/apache/commons/crypto/jna/OpenSsl11XNativeJna.java
+++ b/src/main/java/org/apache/commons/crypto/jna/OpenSsl11XNativeJna.java
@@ -41,9 +41,7 @@ class OpenSsl11XNativeJna {
OpenSslJna.debug("Native.register('%s')%n", libName);
Native.register(libName);
ok = true;
- } catch (final Exception e) {
- thrown = e;
- } catch (final UnsatisfiedLinkError e) {
+ } catch (final Exception | UnsatisfiedLinkError e) {
thrown = e;
} finally {
INIT_OK = ok;
diff --git
a/src/main/java/org/apache/commons/crypto/random/OpenSslCryptoRandom.java
b/src/main/java/org/apache/commons/crypto/random/OpenSslCryptoRandom.java
index 5e5e80b..58e4f6c 100644
--- a/src/main/java/org/apache/commons/crypto/random/OpenSslCryptoRandom.java
+++ b/src/main/java/org/apache/commons/crypto/random/OpenSslCryptoRandom.java
@@ -55,9 +55,7 @@ class OpenSslCryptoRandom extends Random implements
CryptoRandom {
try {
OpenSslCryptoRandomNative.initSR();
opensslLoaded = true;
- } catch (final Exception t) {
- except = t;
- } catch (final UnsatisfiedLinkError t) {
+ } catch (final Exception | UnsatisfiedLinkError t) {
except = t;
}
}
diff --git
a/src/main/java/org/apache/commons/crypto/stream/CryptoInputStream.java
b/src/main/java/org/apache/commons/crypto/stream/CryptoInputStream.java
index 053182a..a7aa93d 100644
--- a/src/main/java/org/apache/commons/crypto/stream/CryptoInputStream.java
+++ b/src/main/java/org/apache/commons/crypto/stream/CryptoInputStream.java
@@ -546,11 +546,7 @@ public class CryptoInputStream extends InputStream
implements
try {
cipher.doFinal(inBuffer, outBuffer);
finalDone = true;
- } catch (final ShortBufferException e) {
- throw new IOException(e);
- } catch (final IllegalBlockSizeException e) {
- throw new IOException(e);
- } catch (final BadPaddingException e) {
+ } catch (final ShortBufferException | IllegalBlockSizeException |
BadPaddingException e) {
throw new IOException(e);
}
