Apache
/
httpcomponents-client
mirror of https://github.com/apache/httpcomponents-client.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HTTPCLIENT-635, port of HTTPCLIENT-633 

git-svn-id: https://svn.apache.org/repos/asf/jakarta/httpcomponents/httpclient/trunk@531152 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Roland Weber 2007-04-22 07:41:06 +00:00
parent 765bbc3947
commit 6802e38045
1 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/java/org/apache/http/impl/conn/ThreadSafeClientConnManager.java
View File

@ -266,6 +266,8 @@ public class ThreadSafeClientConnManager
waitingThread = new WaitingThread();
waitingThread.hostConnectionPool = hostPool;
waitingThread.thread = Thread.currentThread();
} else {
waitingThread.interruptedByConnectionPool = false;
}
if (useTimeout) {
@ -276,13 +278,27 @@ public class ThreadSafeClientConnManager
connectionPool.waitingThreads.addLast(waitingThread);
connectionPool.wait(timeToWait);
// we have not been interrupted so we need to remove ourselves from the
// wait queue
hostPool.waitingThreads.remove(waitingThread);
connectionPool.waitingThreads.remove(waitingThread);
} catch (InterruptedException e) {
// do nothing
if (!waitingThread.interruptedByConnectionPool) {
LOG.debug("Interrupted while waiting for connection", e);
throw new IllegalThreadStateException(
"Interrupted while waiting in ThreadSafeClientConnManager");
}
// Else, do nothing, we were interrupted by the
// connection pool and should now have a connection
// waiting for us. Continue in the loop and get it.
// Or else we are shutting down, which is also
// detected in the loop.
} finally {
if (!waitingThread.interruptedByConnectionPool) {
// Either we timed out, experienced a
// "spurious wakeup", or were interrupted by an
// external thread. Regardless we need to
// cleanup for ourselves in the wait queue.
hostPool.waitingThreads.remove(waitingThread);
connectionPool.waitingThreads.remove(waitingThread);
}
if (useTimeout) {
endWait = System.currentTimeMillis();
timeToWait -= (endWait - startWait);
@ -688,6 +704,7 @@ public class ThreadSafeClientConnManager
while (iter.hasNext()) {
WaitingThread waiter = (WaitingThread) iter.next();
iter.remove();
waiter.interruptedByConnectionPool = true;
waiter.thread.interrupt();
}
@ -903,7 +920,7 @@ public class ThreadSafeClientConnManager
if (LOG.isDebugEnabled()) {
LOG.debug("Notifying thread waiting on host pool, hostConfig="
+ hostPool.hostConfiguration);
}
}
waitingThread = (WaitingThread) hostPool.waitingThreads.removeFirst();
waitingThreads.remove(waitingThread);
} else if (waitingThreads.size() > 0) {
@ -917,6 +934,7 @@ public class ThreadSafeClientConnManager
}
if (waitingThread != null) {
waitingThread.interruptedByConnectionPool = true;
waitingThread.thread.interrupt();
}
}
@ -1025,6 +1043,16 @@ public class ThreadSafeClientConnManager
/** The connection pool the thread is waiting for */
public HostConnectionPool hostConnectionPool;
/**
* Indicates the source of an interruption.
* Set to <code>true</code> inside
* {@link ConnectionPool#notifyWaitingThread(HostConnectionPool)}
* and {@link ThreadSafeClientConnManager#shutdown shutdown()}
* before the thread is interrupted.
* If not set, the thread was interrupted from the outside.
*/
public boolean interruptedByConnectionPool = false;
}
/**