This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch 2.2.X
in repository https://gitbox.apache.org/repos/asf/mina.git
The following commit(s) were added to refs/heads/2.2.X by this push:
new 0756b3654 Throw a RuntimeException subclass instead of
RuntimeException.
0756b3654 is described below
commit 0756b36543e021998b5558c0de0c0bfe89135d90
Author: Gary Gregory <[email protected]>
AuthorDate: Thu Jul 6 12:26:35 2023 -0400
Throw a RuntimeException subclass instead of RuntimeException.
---
.../src/main/java/org/apache/mina/core/buffer/AbstractIoBuffer.java | 4 ++--
.../org/apache/mina/proxy/handlers/http/digest/DigestUtilities.java | 2 +-
.../mina/proxy/handlers/http/digest/HttpDigestAuthLogicHandler.java | 2 +-
mina-core/src/main/java/org/apache/mina/util/CopyOnWriteMap.java | 2 +-
.../java/org/apache/mina/example/echoserver/ssl/SSLSocketFactory.java | 2 +-
.../src/main/java/org/apache/mina/integration/jmx/ObjectMBean.java | 2 +-
.../java/org/apache/mina/transport/socket/apr/AprDatagramSession.java | 4 ++--
.../main/java/org/apache/mina/transport/socket/apr/AprLibrary.java | 2 +-
.../java/org/apache/mina/transport/socket/apr/AprSocketSession.java | 4 ++--
9 files changed, 12 insertions(+), 12 deletions(-)
diff --git
a/mina-core/src/main/java/org/apache/mina/core/buffer/AbstractIoBuffer.java
b/mina-core/src/main/java/org/apache/mina/core/buffer/AbstractIoBuffer.java
index bb57adef3..54d068c4f 100644
--- a/mina-core/src/main/java/org/apache/mina/core/buffer/AbstractIoBuffer.java
+++ b/mina-core/src/main/java/org/apache/mina/core/buffer/AbstractIoBuffer.java
@@ -1815,7 +1815,7 @@ public abstract class AbstractIoBuffer extends IoBuffer {
expandedState++;
break;
default:
- throw new RuntimeException(
+ throw new IllegalArgumentException(
"Expanded by " + (int)
Math.ceil(in.remaining() * encoder.maxBytesPerChar())
+ " but that wasn't enough for '" +
val + "'");
}
@@ -2106,7 +2106,7 @@ public abstract class AbstractIoBuffer extends IoBuffer {
expandedState++;
break;
default:
- throw new RuntimeException(
+ throw new IllegalArgumentException(
"Expanded by " + (int)
Math.ceil(in.remaining() * encoder.maxBytesPerChar())
+ " but that wasn't enough for '" +
val + "'");
}
diff --git
a/mina-core/src/main/java/org/apache/mina/proxy/handlers/http/digest/DigestUtilities.java
b/mina-core/src/main/java/org/apache/mina/proxy/handlers/http/digest/DigestUtilities.java
index 5642cda38..e79dc410d 100644
---
a/mina-core/src/main/java/org/apache/mina/proxy/handlers/http/digest/DigestUtilities.java
+++
b/mina-core/src/main/java/org/apache/mina/proxy/handlers/http/digest/DigestUtilities.java
@@ -48,7 +48,7 @@ public class DigestUtilities {
try {
md5 = MessageDigest.getInstance("MD5");
} catch (NoSuchAlgorithmException e) {
- throw new RuntimeException(e);
+ throw new IllegalArgumentException(e);
}
}
diff --git
a/mina-core/src/main/java/org/apache/mina/proxy/handlers/http/digest/HttpDigestAuthLogicHandler.java
b/mina-core/src/main/java/org/apache/mina/proxy/handlers/http/digest/HttpDigestAuthLogicHandler.java
index f84ebdfb9..1db653226 100644
---
a/mina-core/src/main/java/org/apache/mina/proxy/handlers/http/digest/HttpDigestAuthLogicHandler.java
+++
b/mina-core/src/main/java/org/apache/mina/proxy/handlers/http/digest/HttpDigestAuthLogicHandler.java
@@ -67,7 +67,7 @@ public class HttpDigestAuthLogicHandler extends
AbstractAuthLogicHandler {
try {
rnd = SecureRandom.getInstance("SHA1PRNG");
} catch (NoSuchAlgorithmException e) {
- throw new RuntimeException(e);
+ throw new IllegalArgumentException(e);
}
}
diff --git a/mina-core/src/main/java/org/apache/mina/util/CopyOnWriteMap.java
b/mina-core/src/main/java/org/apache/mina/util/CopyOnWriteMap.java
index bc86e98d8..e1ed061d3 100644
--- a/mina-core/src/main/java/org/apache/mina/util/CopyOnWriteMap.java
+++ b/mina-core/src/main/java/org/apache/mina/util/CopyOnWriteMap.java
@@ -215,7 +215,7 @@ public class CopyOnWriteMap<K, V> implements Map<K, V>,
Cloneable {
try {
return super.clone();
} catch (CloneNotSupportedException e) {
- throw new InternalError();
+ throw new UnsupportedOperationException(e);
}
}
}
diff --git
a/mina-example/src/main/java/org/apache/mina/example/echoserver/ssl/SSLSocketFactory.java
b/mina-example/src/main/java/org/apache/mina/example/echoserver/ssl/SSLSocketFactory.java
index b0eb5590a..2be8ddaea 100644
---
a/mina-example/src/main/java/org/apache/mina/example/echoserver/ssl/SSLSocketFactory.java
+++
b/mina-example/src/main/java/org/apache/mina/example/echoserver/ssl/SSLSocketFactory.java
@@ -96,7 +96,7 @@ public class SSLSocketFactory extends SocketFactory {
sslFactory = BogusSSLContextFactory.getInstance(false)
.getSocketFactory();
} catch (GeneralSecurityException e) {
- throw new RuntimeException("could not create SSL socket", e);
+ throw new IllegalStateException("could not create SSL socket",
e);
}
}
return sslFactory;
diff --git
a/mina-integration-jmx/src/main/java/org/apache/mina/integration/jmx/ObjectMBean.java
b/mina-integration-jmx/src/main/java/org/apache/mina/integration/jmx/ObjectMBean.java
index 25bd03d04..744c9bb64 100644
---
a/mina-integration-jmx/src/main/java/org/apache/mina/integration/jmx/ObjectMBean.java
+++
b/mina-integration-jmx/src/main/java/org/apache/mina/integration/jmx/ObjectMBean.java
@@ -252,7 +252,7 @@ public class ObjectMBean<T> implements ModelMBean,
MBeanRegistration {
PropertyEditor e = getPropertyEditor(source.getClass(), "p" + i,
paramTypes[i]);
if (e == null) {
- throwMBeanException(new RuntimeException("Conversion failure:
" + params[i]));
+ throwMBeanException(new IllegalArgumentException("Conversion
failure: " + params[i]));
}
e.setValue(params[i]);
diff --git
a/mina-transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprDatagramSession.java
b/mina-transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprDatagramSession.java
index 50108ee54..62a9e9ccb 100644
---
a/mina-transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprDatagramSession.java
+++
b/mina-transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprDatagramSession.java
@@ -110,7 +110,7 @@ class AprDatagramSession extends AprSession {
try {
return Socket.optGet(getDescriptor(), Socket.APR_SO_SNDBUF);
} catch (Exception e) {
- throw new RuntimeException("APR Exception", e);
+ throw new IllegalStateException("APR Exception", e);
}
}
@@ -128,7 +128,7 @@ class AprDatagramSession extends AprSession {
try {
return Socket.optGet(getDescriptor(), Socket.APR_SO_RCVBUF);
} catch (Exception e) {
- throw new RuntimeException("APR Exception", e);
+ throw new IllegalStateException("APR Exception", e);
}
}
diff --git
a/mina-transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprLibrary.java
b/mina-transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprLibrary.java
index 8df91ed57..f3cd496fa 100644
---
a/mina-transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprLibrary.java
+++
b/mina-transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprLibrary.java
@@ -77,7 +77,7 @@ class AprLibrary {
try {
Library.initialize(null);
} catch (Throwable t) {
- throw new RuntimeException("Error loading Apache Portable Runtime
(APR).", t);
+ throw new IllegalStateException("Error loading Apache Portable
Runtime (APR).", t);
}
pool = Pool.create(0);
}
diff --git
a/mina-transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketSession.java
b/mina-transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketSession.java
index 3c56b96dc..610211e50 100644
---
a/mina-transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketSession.java
+++
b/mina-transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketSession.java
@@ -179,7 +179,7 @@ class AprSocketSession extends AprSession {
try {
return Socket.optGet(getDescriptor(), Socket.APR_SO_SNDBUF);
} catch (Exception e) {
- throw new RuntimeException("APR Exception", e);
+ throw new IllegalStateException("APR Exception", e);
}
}
@@ -197,7 +197,7 @@ class AprSocketSession extends AprSession {
try {
return Socket.optGet(getDescriptor(), Socket.APR_SO_RCVBUF);
} catch (Exception e) {
- throw new RuntimeException("APR Exception", e);
+ throw new IllegalStateException("APR Exception", e);
}
}
