Author: trustin
Date: Fri Nov 30 00:51:00 2007
New Revision: 599741
URL: http://svn.apache.org/viewvc?rev=599741&view=rev
Log:
* Fixed connection attempt times out too soon when connectTimeout is 0
* Better ConnectException message
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractPollingIoConnector.java
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractPollingIoConnector.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/AbstractPollingIoConnector.java?rev=599741&r1=599740&r2=599741&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractPollingIoConnector.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractPollingIoConnector.java
Fri Nov 30 00:51:00 2007
@@ -268,7 +268,8 @@
ConnectionRequest entry = connectionRequest(handle);
if (currentTime >= entry.deadline) {
- entry.setException(new ConnectException());
+ entry.setException(
+ new ConnectException("Connection timed out."));
cancelQueue.offer(entry);
}
}
@@ -339,8 +340,12 @@
public ConnectionRequest(H handle) {
this.handle = handle;
- this.deadline = System.currentTimeMillis()
- + getConnectTimeoutMillis();
+ long timeout = getConnectTimeoutMillis();
+ if (timeout <= 0L) {
+ this.deadline = Long.MAX_VALUE;
+ } else {
+ this.deadline = System.currentTimeMillis() + timeout;
+ }
}
public H getHandle() {
