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 2012/07/09 17:59:57 UTC
svn commit: r1359234 -
/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java
Author: elecharny
Date: Mon Jul 9 15:59:57 2012
New Revision: 1359234
URL: http://svn.apache.org/viewvc?rev=1359234&view=rev
Log:
Fixed a potential infinite loop by avoiding to send a new close() request when the session is already being closing or has already been closed. Fixes DIRMINA-894
Modified:
mina/branches/2.0/mina-core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java
Modified: mina/branches/2.0/mina-core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java
URL: http://svn.apache.org/viewvc/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java?rev=1359234&r1=1359233&r2=1359234&view=diff
==============================================================================
--- mina/branches/2.0/mina-core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java (original)
+++ mina/branches/2.0/mina-core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java Mon Jul 9 15:59:57 2012
@@ -284,11 +284,15 @@ public abstract class AbstractIoSession
* {@inheritDoc}
*/
public final CloseFuture close(boolean rightNow) {
- if (rightNow) {
- return close();
+ if ( !isClosing() ) {
+ if (rightNow) {
+ return close();
+ }
+
+ return closeOnFlush();
+ } else {
+ return closeFuture;
}
-
- return closeOnFlush();
}
/**