This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch mina-2.2.X-DIRMINA-1199
in repository https://gitbox.apache.org/repos/asf/mina.git
The following commit(s) were added to refs/heads/mina-2.2.X-DIRMINA-1199 by
this push:
new 6a3fdef7e Cleaned up the branch
6a3fdef7e is described below
commit 6a3fdef7e3ebf65d365e116d4f42ed41f864159b
Author: emmanuel lecharny <[email protected]>
AuthorDate: Sun Oct 11 23:28:54 2026 +0200
Cleaned up the branch
---
.../org/apache/mina/filter/ssl/SSLHandlerG0.java | 48 ---------------------
.../org/apache/mina/filter/ssl/SSLHandlerG1.java | 50 +---------------------
2 files changed, 1 insertion(+), 97 deletions(-)
diff --git
a/mina-core/src/main/java/org/apache/mina/filter/ssl/SSLHandlerG0.java
b/mina-core/src/main/java/org/apache/mina/filter/ssl/SSLHandlerG0.java
index 3fee601df..c01ea6a01 100644
--- a/mina-core/src/main/java/org/apache/mina/filter/ssl/SSLHandlerG0.java
+++ b/mina-core/src/main/java/org/apache/mina/filter/ssl/SSLHandlerG0.java
@@ -94,11 +94,6 @@ import org.apache.mina.core.write.WriteRequest;
*/
protected Thread mDecodeThread = null;
- /**
- * Captured error state
- */
- //protected SSLException mPendingError = null;
-
/**
* Instantiates a new handler
*
@@ -459,26 +454,6 @@ import org.apache.mina.core.write.WriteRequest;
return false;
}
- /**
- * Attempts to generate a handshake message and write the data to the
IoSession
- *
- * @param next
- *
- * @return {@code true} if a message was generated and written
- *
- * @throws SSLException
- */
-// synchronized protected boolean write_handshake(NextFilter next) throws
SSLException {
-// if (LOGGER.isDebugEnabled()) {
-// LOGGER.debug("{} write_handshake() - internal", toString());
-// }
-//
-// IoBuffer source = ZERO;
-// IoBuffer dest = allocate_encode_buffer(source.remaining());
-//
-// return write_handshake_loop(next, source, dest);
-// }
-
/**
* Attempts to generate a handshake message and write the data to the
IoSession.
* <p>
@@ -685,29 +660,6 @@ import org.apache.mina.core.write.WriteRequest;
}
}
- /**
- * Process the pending error and loop to send the associated alert if we
have some.
- *
- * @param next The next filter in the chain
- * @throws SSLException The rethrown pending error
- */
-// synchronized protected void throw_pending_error(NextFilter next) throws
SSLException {
-// SSLException sslException = mPendingError;
-//
-// if (sslException != null) {
-// // Errors are fatal: the pending error stays set and is rethrown
on every subsequent call.
-// if (mEngine.isInboundDone() && mEngine.getHandshakeStatus() ==
HandshakeStatus.NEED_WRAP) {
-// if (LOGGER.isDebugEnabled()) {
-// LOGGER.debug("{} throw_pending_error() - handshake needs
wrap, invoking write", toString());
-// }
-//
-// write_handshake(next);
-// }
-//
-// throw sslException;
-// }
-// }
-
/**
* Store any error we've got during the handshake or message handling
*
diff --git
a/mina-core/src/main/java/org/apache/mina/filter/ssl/SSLHandlerG1.java
b/mina-core/src/main/java/org/apache/mina/filter/ssl/SSLHandlerG1.java
index ae518bf17..563008872 100644
--- a/mina-core/src/main/java/org/apache/mina/filter/ssl/SSLHandlerG1.java
+++ b/mina-core/src/main/java/org/apache/mina/filter/ssl/SSLHandlerG1.java
@@ -70,7 +70,7 @@ import java.util.concurrent.Executor;
/**
* Enable asynchronous tasks. Default to false.
*/
- static protected final boolean ENABLE_ASYNC_TASKS = false;
+ static protected final boolean ENABLE_ASYNC_TASKS = true;
/**
* Indicates whether the first handshake was completed
@@ -111,11 +111,6 @@ import java.util.concurrent.Executor;
* Pending filter events for dispatching
*/
protected final Deque<FilterEvent> mEventQueue = new
ConcurrentLinkedDeque<>();
-//
-// /**
-// * Captured error state
-// */
-// protected SSLException mPendingError = null;
/**
* Instantiates a new handler
@@ -500,26 +495,6 @@ import java.util.concurrent.Executor;
return false;
}
- /**
- * Attempts to generate a handshake message and write the data to the
IoSession
- *
- * @param next
- *
- * @return {@code true} if a message was generated and written
- *
- * @throws SSLException
- */
-// synchronized protected boolean write_handshake(NextFilter next) throws
SSLException {
-// if (LOGGER.isDebugEnabled()) {
-// LOGGER.debug("{} write_handshake() - internal", toString());
-// }
-//
-// IoBuffer source = ZERO;
-// IoBuffer dest = allocate_encode_buffer(source.remaining());
-//
-// return write_handshake_loop(next, source, dest);
-// }
-
/**
* Attempts to generate a handshake message and write the data to the
IoSession.
* <p>
@@ -739,29 +714,6 @@ import java.util.concurrent.Executor;
}
}
- /**
- * Process the pending error and loop to send the associated alert if we
have some.
- *
- * @param next The next filter in the chain
- * @throws SSLException The rethrown pending error
- */
-// synchronized protected void throw_pending_error(NextFilter next) throws
SSLException {
-// SSLException sslException = mPendingError;
-//
-// if (sslException != null) {
-// // Errors are fatal: the pending error stays set and is rethrown
on every subsequent call.
-// if (mEngine.isInboundDone() && mEngine.getHandshakeStatus() ==
HandshakeStatus.NEED_WRAP) {
-// if (LOGGER.isDebugEnabled()) {
-// LOGGER.debug("{} throw_pending_error() - handshake needs
wrap, invoking write", toString());
-// }
-//
-// write_handshake(next);
-// }
-//
-// throw sslException;
-// }
-// }
-
/**
* Store any error we've got during the handshake or message handling
*
