[mina] branch 2.2.X updated: Refactor commons code pattern

[ggregory]

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 c272d8f3a Refactor commons code pattern
c272d8f3a is described below

commit c272d8f3a3e7605ea5a1daecf9e38848bb424aaf
Author: Gary Gregory <ggreg...@rocketsoftware.com>
AuthorDate: Thu Dec 1 17:17:17 2022 -0500

    Refactor commons code pattern
---
 .../java/org/apache/mina/filter/ssl/SslFilter.java     | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/mina-core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java 
b/mina-core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java
index d63e4855e..d019bbb8f 100644
--- a/mina-core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java
+++ b/mina-core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java
@@ -174,6 +174,16 @@ public class SslFilter extends IoFilterAdapter {
         return enabledProtocols;
     }
 
+    /**
+     * Gets the given session's SslHandler.
+     *
+     * @param session An IoSession to query.
+     * @return the given session's SslHandler.
+     */
+    private SslHandler getSslHandler(IoSession session) {
+        return SslHandler.class.cast(session.getAttribute(SSL_HANDLER));
+    }
+
     /**
      * Sets the list of protocols to be enabled when {@link SSLEngine} is
      * initialized.
@@ -232,7 +242,7 @@ public class SslFilter extends IoFilterAdapter {
      * @throws SSLException Any exception thrown by the SslHandler closing
      */
     synchronized protected void onConnected(NextFilter next, IoSession 
session) throws SSLException {
-        SslHandler sslHandler = 
SslHandler.class.cast(session.getAttribute(SSL_HANDLER));
+        SslHandler sslHandler = getSslHandler(session);
 
         if (sslHandler == null) {
             InetSocketAddress s = 
InetSocketAddress.class.cast(session.getRemoteAddress());
@@ -338,7 +348,7 @@ public class SslFilter extends IoFilterAdapter {
             LOGGER.debug("session {} received {}", session, message);
         }
         
-        SslHandler sslHandler = 
SslHandler.class.cast(session.getAttribute(SSL_HANDLER));
+        SslHandler sslHandler = getSslHandler(session);
         sslHandler.receive(next, IoBuffer.class.cast(message));
     }
 
@@ -353,7 +363,7 @@ public class SslFilter extends IoFilterAdapter {
 
         if (request instanceof EncryptedWriteRequest) {
             EncryptedWriteRequest encryptedWriteRequest = 
EncryptedWriteRequest.class.cast(request);
-            SslHandler sslHandler = 
SslHandler.class.cast(session.getAttribute(SSL_HANDLER));
+            SslHandler sslHandler = getSslHandler(session);
             sslHandler.ack(next, request);
             
             if (encryptedWriteRequest.getOriginalRequest() != 
encryptedWriteRequest) {
@@ -376,7 +386,7 @@ public class SslFilter extends IoFilterAdapter {
         if (request instanceof EncryptedWriteRequest || request instanceof 
DisableEncryptWriteRequest) {
             super.filterWrite(next, session, request);
         } else {
-            SslHandler sslHandler = 
SslHandler.class.cast(session.getAttribute(SSL_HANDLER));
+            SslHandler sslHandler = getSslHandler(session);
             sslHandler.write(next, request);
         }
     }