[mina] branch 2.0.X updated: Backported 2.1 fixes

[elecharny]

This is an automated email from the ASF dual-hosted git repository.

elecharny pushed a commit to branch 2.0.X
in repository https://gitbox.apache.org/repos/asf/mina.git


The following commit(s) were added to refs/heads/2.0.X by this push:
     new e4cc18e  Backported 2.1 fixes
e4cc18e is described below

commit e4cc18ee634f70b6cc163c1af569a04598c5f0d0
Author: emmanuel lecharny <elecha...@apache.org>
AuthorDate: Tue Feb 8 18:18:43 2022 +0100

    Backported 2.1 fixes
---
 .../src/main/java/org/apache/mina/core/buffer/AbstractIoBuffer.java  | 2 ++
 .../main/java/org/apache/mina/core/session/AbstractIoSession.java    | 5 +++++
 mina-core/src/main/java/org/apache/mina/core/session/IoSession.java  | 5 +++++
 3 files changed, 12 insertions(+)

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 5d97142..74ed0a9 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
@@ -1319,6 +1319,8 @@ public abstract class AbstractIoBuffer extends IoBuffer {
         } else {
             buf.append("HeapBuffer");
         }
+        buf.append("@");
+        buf.append(Integer.toHexString(super.hashCode()));
         buf.append("[pos=");
         buf.append(position());
         buf.append(" lim=");
diff --git 
a/mina-core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java 
b/mina-core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java
index 524dfa0..a45871a 100644
--- 
a/mina-core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java
+++ 
b/mina-core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java
@@ -249,6 +249,11 @@ public abstract class AbstractIoSession implements 
IoSession {
         // Always false...
         return false;
     }
+    
+    @Override
+    public boolean isServer() {
+        return (getService() instanceof IoAcceptor);
+    }
 
     /**
      * {@inheritDoc}
diff --git 
a/mina-core/src/main/java/org/apache/mina/core/session/IoSession.java 
b/mina-core/src/main/java/org/apache/mina/core/session/IoSession.java
index 9abdf01..d147f3e 100644
--- a/mina-core/src/main/java/org/apache/mina/core/session/IoSession.java
+++ b/mina-core/src/main/java/org/apache/mina/core/session/IoSession.java
@@ -400,6 +400,11 @@ public interface IoSession {
      * or if SSL is not set for this session, or if SSL is not even an option.
      */
     boolean isSecured();
+    
+    /**
+     * @return <tt>true</tt> if the session was created by an acceptor.
+     */
+    boolean isServer();
 
     /**
      * @return the {@link CloseFuture} of this session.  This method returns