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 de3f72303 Throw IllegalStateException instead of InternalError
de3f72303 is described below
commit de3f72303a80dd658de237f83aedafbda7d0327a
Author: Gary Gregory <[email protected]>
AuthorDate: Wed Jul 12 09:51:39 2023 -0400
Throw IllegalStateException instead of InternalError
InternalError is intended for unexpected internal errors that occur in
the Java Virtual Machine
---
mina-core/src/main/java/org/apache/mina/core/IoUtil.java | 2 +-
.../src/main/java/org/apache/mina/core/future/DefaultIoFuture.java | 4 ++--
.../src/main/java/org/apache/mina/core/session/DummySession.java | 2 +-
.../apache/mina/filter/codec/statemachine/IntegerDecodingState.java | 2 +-
.../mina/filter/codec/statemachine/ShortIntegerDecodingState.java | 2 +-
.../java/org/apache/mina/integration/beans/InetAddressEditor.java | 2 +-
.../java/org/apache/mina/transport/socket/apr/AprSocketConnector.java | 4 ++--
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/mina-core/src/main/java/org/apache/mina/core/IoUtil.java
b/mina-core/src/main/java/org/apache/mina/core/IoUtil.java
index 32b06e50f..ad97703f7 100644
--- a/mina-core/src/main/java/org/apache/mina/core/IoUtil.java
+++ b/mina-core/src/main/java/org/apache/mina/core/IoUtil.java
@@ -205,7 +205,7 @@ public final class IoUtil {
try {
return await0(futures, timeoutMillis, false);
} catch (InterruptedException e) {
- throw new InternalError();
+ throw new IllegalStateException(e);
}
}
diff --git
a/mina-core/src/main/java/org/apache/mina/core/future/DefaultIoFuture.java
b/mina-core/src/main/java/org/apache/mina/core/future/DefaultIoFuture.java
index 73d58de46..40386d55b 100644
--- a/mina-core/src/main/java/org/apache/mina/core/future/DefaultIoFuture.java
+++ b/mina-core/src/main/java/org/apache/mina/core/future/DefaultIoFuture.java
@@ -161,7 +161,7 @@ public class DefaultIoFuture implements IoFuture {
try {
return await0(unit.toMillis(timeout), false);
} catch (InterruptedException e) {
- throw new InternalError();
+ throw new IllegalStateException();
}
}
@@ -173,7 +173,7 @@ public class DefaultIoFuture implements IoFuture {
try {
return await0(timeoutMillis, false);
} catch (InterruptedException e) {
- throw new InternalError();
+ throw new IllegalStateException();
}
}
diff --git
a/mina-core/src/main/java/org/apache/mina/core/session/DummySession.java
b/mina-core/src/main/java/org/apache/mina/core/session/DummySession.java
index 915f249d9..1da93370c 100644
--- a/mina-core/src/main/java/org/apache/mina/core/session/DummySession.java
+++ b/mina-core/src/main/java/org/apache/mina/core/session/DummySession.java
@@ -244,7 +244,7 @@ public class DummySession extends AbstractIoSession {
setAttributeMap(factory.getAttributeMap(this));
setWriteRequestQueue(factory.getWriteRequestQueue(this));
} catch (Exception e) {
- throw new InternalError();
+ throw new IllegalStateException();
}
}
diff --git
a/mina-core/src/main/java/org/apache/mina/filter/codec/statemachine/IntegerDecodingState.java
b/mina-core/src/main/java/org/apache/mina/filter/codec/statemachine/IntegerDecodingState.java
index 631c1e53f..2c3c92dd3 100644
---
a/mina-core/src/main/java/org/apache/mina/filter/codec/statemachine/IntegerDecodingState.java
+++
b/mina-core/src/main/java/org/apache/mina/filter/codec/statemachine/IntegerDecodingState.java
@@ -60,7 +60,7 @@ public abstract class IntegerDecodingState implements
DecodingState {
return finishDecode((firstByte << 24) | (secondByte << 16)
| (thirdByte << 8) | in.getUnsigned(), out);
default:
- throw new InternalError();
+ throw new IllegalStateException();
}
counter++;
diff --git
a/mina-core/src/main/java/org/apache/mina/filter/codec/statemachine/ShortIntegerDecodingState.java
b/mina-core/src/main/java/org/apache/mina/filter/codec/statemachine/ShortIntegerDecodingState.java
index c219a90c2..e20c43407 100644
---
a/mina-core/src/main/java/org/apache/mina/filter/codec/statemachine/ShortIntegerDecodingState.java
+++
b/mina-core/src/main/java/org/apache/mina/filter/codec/statemachine/ShortIntegerDecodingState.java
@@ -51,7 +51,7 @@ public abstract class ShortIntegerDecodingState implements
DecodingState {
return finishDecode((short) ((highByte << 8) |
in.getUnsigned()), out);
default:
- throw new InternalError();
+ throw new IllegalStateException();
}
counter++;
diff --git
a/mina-integration-beans/src/main/java/org/apache/mina/integration/beans/InetAddressEditor.java
b/mina-integration-beans/src/main/java/org/apache/mina/integration/beans/InetAddressEditor.java
index 20213e464..a5d6e3eef 100644
---
a/mina-integration-beans/src/main/java/org/apache/mina/integration/beans/InetAddressEditor.java
+++
b/mina-integration-beans/src/main/java/org/apache/mina/integration/beans/InetAddressEditor.java
@@ -70,7 +70,7 @@ public class InetAddressEditor extends AbstractPropertyEditor
{
try {
return InetAddress.getByName("0.0.0.0");
} catch (UnknownHostException e) {
- throw new InternalError();
+ throw new IllegalStateException();
}
}
}
diff --git
a/mina-transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketConnector.java
b/mina-transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketConnector.java
index 8c943b834..83ee75574 100644
---
a/mina-transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketConnector.java
+++
b/mina-transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketConnector.java
@@ -201,7 +201,7 @@ public final class AprSocketConnector extends
AbstractPollingIoConnector<AprSess
}
throwException(rv);
- throw new InternalError(); // This sentence will never be executed.
+ throw new IllegalStateException(); // This statement will never be
executed.
}
/**
@@ -234,7 +234,7 @@ public final class AprSocketConnector extends
AbstractPollingIoConnector<AprSess
if (failedHandles.remove(handle)) {
int rv = Socket.recvb(handle, dummyBuffer, 0, 1);
throwException(rv);
- throw new InternalError("Shouldn't reach here.");
+ throw new IllegalStateException("Shouldn't reach here.");
}
return true;
}
