You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by el...@apache.org on 2015/12/04 23:42:51 UTC

[1/5] mina git commit: Fixed some javadoc

Repository: mina
Updated Branches:
  refs/heads/2.0 763c2fb5b -> 64b31e0e0


Fixed some javadoc

Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/8bb2a348
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/8bb2a348
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/8bb2a348

Branch: refs/heads/2.0
Commit: 8bb2a348c6118039da2ab4e78ada3ec183a689f0
Parents: 763c2fb
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Fri Dec 4 21:39:06 2015 +0100
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Fri Dec 4 21:39:06 2015 +0100

----------------------------------------------------------------------
 .../src/main/java/org/apache/mina/core/filterchain/IoFilter.java   | 2 +-
 .../main/java/org/apache/mina/core/filterchain/IoFilterChain.java  | 2 +-
 .../src/main/java/org/apache/mina/core/session/IoSession.java      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mina/blob/8bb2a348/mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilter.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilter.java b/mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilter.java
index c0b335a..f7deaa0 100644
--- a/mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilter.java
+++ b/mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilter.java
@@ -242,7 +242,7 @@ public interface IoFilter {
     void messageSent(NextFilter nextFilter, IoSession session, WriteRequest writeRequest) throws Exception;
 
     /**
-     * Filters {@link IoSession#close()} method invocation.
+     * Filters {@link IoSession#close(boolean)} method invocation.
      * 
      * @param nextFilter
      *            the {@link NextFilter} for this filter. You can reuse this

http://git-wip-us.apache.org/repos/asf/mina/blob/8bb2a348/mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilterChain.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilterChain.java b/mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilterChain.java
index c7e8e1e..9b3df99 100644
--- a/mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilterChain.java
+++ b/mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilterChain.java
@@ -321,7 +321,7 @@ public interface IoFilterChain {
     public void fireFilterWrite(WriteRequest writeRequest);
 
     /**
-     * Fires a {@link IoSession#close()} event. Most users don't need to call this method at
+     * Fires a {@link IoSession#close(boolean)} event. Most users don't need to call this method at
      * all. Please use this method only when you implement a new transport or fire a virtual
      * event.
      */

http://git-wip-us.apache.org/repos/asf/mina/blob/8bb2a348/mina-core/src/main/java/org/apache/mina/core/session/IoSession.java
----------------------------------------------------------------------
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 56dd3f7..79f9d94 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
@@ -167,7 +167,7 @@ public interface IoSession {
      *                    . The pending write requests
      *                    will simply be discarded.
      *                    {@code false} to close this session after all queued
-     *                    write requests are flushed (i.e. {@link #close()}).
+     *                    write requests are flushed.
      */
     CloseFuture close(boolean immediately);
 


[5/5] mina git commit: bumped up some artifacts and plugins

Posted by el...@apache.org.
bumped up some artifacts and plugins


Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/64b31e0e
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/64b31e0e
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/64b31e0e

Branch: refs/heads/2.0
Commit: 64b31e0e083afae0070f516162a61bf3caf29d9a
Parents: a076f65
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Fri Dec 4 23:42:36 2015 +0100
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Fri Dec 4 23:42:36 2015 +0100

----------------------------------------------------------------------
 pom.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mina/blob/64b31e0e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0929484..20c28f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,7 +90,7 @@
 
     <!-- Maven Plugins -->
     <version.apache.rat.plugin>0.11</version.apache.rat.plugin>
-    <version.api.plugin>3.3.3</version.api.plugin>
+    <version.api.plugin>3.3.9</version.api.plugin>
     <version.assembly.plugin>2.5.3</version.assembly.plugin>
     <version.build.helper.plugin>1.9.1</version.build.helper.plugin>
     <version.bundle.plugin>2.5.3</version.bundle.plugin>
@@ -114,7 +114,7 @@
     <version.javadoc.plugin>2.10.1</version.javadoc.plugin>
     <version.jdepend.plugin>2.0</version.jdepend.plugin>
     <version.jxr.plugin>2.5</version.jxr.plugin>
-    <version.model.plugin>3.3.3</version.model.plugin>
+    <version.model.plugin>3.3.9</version.model.plugin>
     <version.plexus.utils>3.0.22</version.plexus.utils>
     <version.plugin.plugin>3.4</version.plugin.plugin>
     <version.pmd.plugin>3.3</version.pmd.plugin>
@@ -127,7 +127,7 @@
     <version.scm.plugin>1.9.2</version.scm.plugin>
     <version.site.plugin>3.4</version.site.plugin>
     <version.source.plugin>2.4</version.source.plugin>
-    <version.shade.plugin>2.4.1</version.shade.plugin>
+    <version.shade.plugin>2.4.2</version.shade.plugin>
     <version.surefire.plugin>2.18.1</version.surefire.plugin>
     <version.surfire.report.plugin>2.18.1</version.surfire.report.plugin>
     <version.taglist.plugin>2.4</version.taglist.plugin>
@@ -144,15 +144,15 @@
     <version.junit>4.12</version.junit>
     <version.jzlib>1.1.3</version.jzlib>
     <version.log4j>1.2.17</version.log4j>
-    <version.ognl>3.1</version.ognl>
+    <version.ognl>3.1.1</version.ognl>
     <version.pmd>4.3</version.pmd>
     <version.rmock>2.0.2</version.rmock>
-    <version.slf4j.api>1.7.12</version.slf4j.api>
-    <version.slf4j.log4j12>1.7.12</version.slf4j.log4j12>
-    <version.slf4j.jcl.over.slf4j>1.7.12</version.slf4j.jcl.over.slf4j>
+    <version.slf4j.api>1.7.13</version.slf4j.api>
+    <version.slf4j.log4j12>1.7.13</version.slf4j.log4j12>
+    <version.slf4j.jcl.over.slf4j>1.7.13</version.slf4j.jcl.over.slf4j>
     <version.springframework>2.5.6.SEC03</version.springframework>
     <version.tomcat.jni>8.0.27</version.tomcat.jni>
-    <version.xbean.spring>4.4</version.xbean.spring>
+    <version.xbean.spring>4.5</version.xbean.spring>
 
     <!-- OSGi minimum versions -->
     <osgi-min-version.slf4j.api>1.7</osgi-min-version.slf4j.api>


[2/5] mina git commit: o Imported the code of the close() deprecated method o Stop using the deprecated close() method in MINA

Posted by el...@apache.org.
o Imported the code of the close() deprecated method
o Stop using the deprecated close() method in MINA

Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/14078181
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/14078181
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/14078181

Branch: refs/heads/2.0
Commit: 14078181493bc57fc93503ae693b3dbfbada7df7
Parents: 8bb2a34
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Fri Dec 4 21:40:02 2015 +0100
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Fri Dec 4 21:40:02 2015 +0100

----------------------------------------------------------------------
 .../org/apache/mina/core/session/AbstractIoSession.java | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mina/blob/14078181/mina-core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java
----------------------------------------------------------------------
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 f59adf2..0c3ea7a 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
@@ -294,7 +294,15 @@ public abstract class AbstractIoSession implements IoSession {
     public final CloseFuture close(boolean rightNow) {
         if (!isClosing()) {
             if (rightNow) {
-                CloseFuture closeFuture = close();
+                synchronized (lock) {
+                    if (isClosing()) {
+                        return closeFuture;
+                    }
+
+                    closing = true;
+                }
+
+                getFilterChain().fireFilterClose();
 
                 return closeFuture;
             }
@@ -1359,7 +1367,7 @@ public abstract class AbstractIoSession implements IoSession {
             WriteRequest answer = queue.poll(session);
 
             if (answer == CLOSE_REQUEST) {
-                AbstractIoSession.this.close();
+                AbstractIoSession.this.close( true );
                 dispose(session);
                 answer = null;
             }


[3/5] mina git commit: Close the session when an exception is caught while flushing the session.

Posted by el...@apache.org.
Close the session when an exception is caught while flushing the
session.

Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/40634db1
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/40634db1
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/40634db1

Branch: refs/heads/2.0
Commit: 40634db13455f4dffa781875285455004ff343a4
Parents: 1407818
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Fri Dec 4 23:06:08 2015 +0100
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Fri Dec 4 23:06:08 2015 +0100

----------------------------------------------------------------------
 .../org/apache/mina/core/polling/AbstractPollingIoProcessor.java    | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mina/blob/40634db1/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java b/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java
index ad9ae5d..e6b141c 100644
--- a/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java
+++ b/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java
@@ -788,6 +788,7 @@ public abstract class AbstractPollingIoProcessor<S extends AbstractIoSession> im
                     }
                 } catch (Exception e) {
                     scheduleRemove(session);
+                    session.close(true);
                     IoFilterChain filterChain = session.getFilterChain();
                     filterChain.fireExceptionCaught(e);
                 }


[4/5] mina git commit: Made the selection key private

Posted by el...@apache.org.
Made the selection key private

Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/a076f65c
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/a076f65c
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/a076f65c

Branch: refs/heads/2.0
Commit: a076f65ca215934666974eb637a1b25b5288a9cc
Parents: 40634db
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Fri Dec 4 23:07:48 2015 +0100
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Fri Dec 4 23:07:48 2015 +0100

----------------------------------------------------------------------
 .../main/java/org/apache/mina/transport/socket/nio/NioSession.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mina/blob/a076f65c/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioSession.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioSession.java b/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioSession.java
index 53a7623..b633e49 100644
--- a/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioSession.java
+++ b/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioSession.java
@@ -43,7 +43,7 @@ public abstract class NioSession extends AbstractIoSession {
     protected final Channel channel;
 
     /** The SelectionKey used for this session */
-    protected SelectionKey key;
+    private SelectionKey key;
 
     /** The FilterChain created for this session */
     private final IoFilterChain filterChain;