Author: elecharny
Date: Tue Mar 10 23:08:25 2009
New Revision: 752297
URL: http://svn.apache.org/viewvc?rev=752297&view=rev
Log:
Added a test in the ConnectionRequest.cancel() method : if the connection is
already closed, no need to cancel it again.
Thanks to Victor for this good catch !
Modified:
mina/trunk/core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoConnector.java
Modified:
mina/trunk/core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoConnector.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoConnector.java?rev=752297&r1=752296&r2=752297&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoConnector.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoConnector.java
Tue Mar 10 23:08:25 2009
@@ -558,10 +558,12 @@
@Override
public void cancel() {
- super.cancel();
- cancelQueue.add(this);
- startupWorker();
- wakeup();
+ if ( !isDone() ) {
+ super.cancel();
+ cancelQueue.add(this);
+ startupWorker();
+ wakeup();
+ }
}
}
}